Merge branch 'main' of https://github.com/drycc/controller-sdk-go into main

Author: duanhongyi

.drone/drone.yml

@@ -9,7 +9,7 @@ platform:
 steps:
 - name: test
   image: docker.io/drycc/go-dev
-  pull: if-not-exists
+  pull: always
   privileged: true
   commands:
   - make bootstrap test
@@ -28,7 +28,7 @@ steps:
 
 - name: codecov
   image: docker.io/drycc/go-dev
-  pull: if-not-exists
+  pull: always
   commands:
   - curl -s https://codecov.io/bash | bash
   environment:

api/auth.go

@@ -9,12 +9,6 @@ type AuthRegisterRequest struct {
 	LastName  string `json:"last_name,omitempty"`
 }
 
-// AuthLoginRequest is the definition of POST /v2/auth/login/.
-type AuthLoginRequest struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-}
-
 // AuthLoginResponse is the definition of /v2/auth/login/.
 type AuthLoginResponse tokenResponse
 
@@ -41,5 +35,6 @@ type AuthRegenerateResponse tokenResponse
 
 // A generic defenition of a token response.
 type tokenResponse struct {
-	Token string `json:"token"`
+	Token    string `json:"token"`
+	Username string `json:"username,omitempty"`
 }

auth/auth.go

@@ -3,140 +3,41 @@ package auth
 
 import (
 	"encoding/json"
-
+	"fmt"
 	drycc "github.com/drycc/controller-sdk-go"
 	"github.com/drycc/controller-sdk-go/api"
+	"net/http"
 )
 
-// Register a new user with the controller.
-// If controller registration is set to administrators only, a valid administrative
-// user token is required in the client.
-func Register(c *drycc.Client, username, password, email string) error {
-	user := api.AuthRegisterRequest{Username: username, Password: password, Email: email}
-	body, err := json.Marshal(user)
-
-	if err != nil {
-		return err
-	}
-
-	res, err := c.Request("POST", "/v2/auth/register/", body)
-	if err == nil {
-		res.Body.Close()
+// Login to the controller and get a oauth url
+func Login(c *drycc.Client) (string, error) {
+	c.HTTPClient.CheckRedirect = func(req *http.Request, via []*http.Request) error {
+		return http.ErrUseLastResponse
 	}
-	return err
-}
+	res, reqErr := c.Request("POST", "/v2/auth/login/", nil)
 
-// Login to the controller and get a token
-func Login(c *drycc.Client, username, password string) (string, error) {
-	user := api.AuthLoginRequest{Username: username, Password: password}
-	reqBody, err := json.Marshal(user)
-
-	if err != nil {
-		return "", err
-	}
-
-	res, reqErr := c.Request("POST", "/v2/auth/login/", reqBody)
 	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
 		return "", reqErr
 	}
 	defer res.Body.Close()
 
-	token := api.AuthLoginResponse{}
-	if err = json.NewDecoder(res.Body).Decode(&token); err != nil {
-		return "", err
-	}
-
-	return token.Token, reqErr
-}
-
-// Delete deletes a user.
-func Delete(c *drycc.Client, username string) error {
-	var body []byte
-	var err error
-
-	if username != "" {
-		req := api.AuthCancelRequest{Username: username}
-		body, err = json.Marshal(req)
-
-		if err != nil {
-			return err
-		}
-	}
-
-	res, err := c.Request("DELETE", "/v2/auth/cancel/", body)
-	if err == nil {
-		res.Body.Close()
-	}
-	return err
+	URL := res.Header.Get("Location")
+	return URL, reqErr
 }
 
-// Regenerate auth tokens. This invalidates existing tokens, and if targeting a specific user
-// returns a new token.
-//
-// If username is an empty string and all is false, this regenerates the
-// client user's token and will return a new token. Make sure to update the client token
-// with this new token to avoid authentication errors.
-//
-// If username is set and all is false, this will regenerate that user's token
-// and return a new token. If not targeting yourself, regenerate requires administrative privileges.
-//
-// If all is true, this will regenerate every user's token. This requires administrative privileges.
-func Regenerate(c *drycc.Client, username string, all bool) (string, error) {
-	var reqBody []byte
-	var err error
-
-	if all {
-		reqBody, err = json.Marshal(api.AuthRegenerateRequest{All: all})
-	} else if username != "" {
-		reqBody, err = json.Marshal(api.AuthRegenerateRequest{Name: username})
-	}
-
-	if err != nil {
-		return "", err
-	}
-
-	res, reqErr := c.Request("POST", "/v2/auth/tokens/", reqBody)
+// Token to the controller and get a token
+func Token(c *drycc.Client, key string) (api.AuthLoginResponse, error) {
+	path := fmt.Sprintf("/v2/auth/token/%s/", key)
+	res, reqErr := c.Request("GET", path, nil)
 	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
-		return "", reqErr
+		return api.AuthLoginResponse{}, reqErr
 	}
 	defer res.Body.Close()
-
-	if all {
-		return "", nil
-	}
-
-	token := api.AuthRegenerateResponse{}
-	if err = json.NewDecoder(res.Body).Decode(&token); err != nil {
-		return "", err
-	}
-
-	return token.Token, reqErr
-}
-
-// Passwd changes a user's password.
-//
-// If username if an empty string, change the password of the client's user.
-//
-// If username is set, change the password of another user and do not require
-// their password. This requires administrative privileges.
-func Passwd(c *drycc.Client, username, password, newPassword string) error {
-	req := api.AuthPasswdRequest{Password: password, NewPassword: newPassword}
-
-	if username != "" {
-		req.Username = username
-	}
-
-	body, err := json.Marshal(req)
-
-	if err != nil {
-		return err
-	}
-
-	res, err := c.Request("POST", "/v2/auth/passwd/", body)
-	if err == nil {
-		res.Body.Close()
+	token := api.AuthLoginResponse{}
+	if err := json.NewDecoder(res.Body).Decode(&token); err != nil {
+		return api.AuthLoginResponse{}, err
 	}
-	return err
+	return token, reqErr
 }
 
 // Whoami retrives the user object for the authenticated user.