feat(auth): add password login

Author: duanhongyi

api/auth.go

@@ -1,40 +1,16 @@
 package api
 
-// AuthRegisterRequest is the definition of POST /v2/auth/register/.
-type AuthRegisterRequest struct {
-	Username  string `json:"username"`
-	Password  string `json:"password"`
-	Email     string `json:"email"`
-	FirstName string `json:"first_name,omitempty"`
-	LastName  string `json:"last_name,omitempty"`
-}
-
-// AuthLoginResponse is the definition of /v2/auth/login/.
-type AuthLoginResponse tokenResponse
-
-// AuthPasswdRequest is the definition of POST /v2/auth/passwd/.
-type AuthPasswdRequest struct {
-	Username    string `json:"username,omitempty"`
-	Password    string `json:"password,omitempty"`
-	NewPassword string `json:"new_password"`
-}
-
-// AuthRegenerateRequest is the definition of POST /v2/auth/tokens/.
-type AuthRegenerateRequest struct {
-	Name string `json:"username,omitempty"`
-	All  bool   `json:"all,omitempty"`
+type AuthLoginRequest struct {
+	Username string `json:"username,omitempty"`
+	Password string `json:"password,omitempty"`
 }
 
-// AuthCancelRequest is the definition of POST /v2/auth/cancel/.
-type AuthCancelRequest struct {
-	Username string `json:"username"`
+type AuthLoginResponse struct {
+	Key string `json:"key,omitempty"`
 }
 
-// AuthRegenerateResponse is the definition of /v2/auth/tokens/.
-type AuthRegenerateResponse tokenResponse
-
-// A generic defenition of a token response.
-type tokenResponse struct {
+// AuthTokenResponse is the definition of /v2/auth/login/.
+type AuthTokenResponse struct {
 	Token    string `json:"token"`
 	Username string `json:"username,omitempty"`
 }

auth/auth.go

@@ -11,32 +11,49 @@ import (
 )
 
 // Login to the controller and get a oauth url
-func Login(c *drycc.Client) (string, error) {
+func Login(c *drycc.Client, username, password string) (string, error) {
 	c.HTTPClient.CheckRedirect = func(*http.Request, []*http.Request) error {
 		return http.ErrUseLastResponse
 	}
-	res, reqErr := c.Request("POST", "/v2/auth/login/", nil)
+	var err error
+	var body []byte
+	if username != "" && password != "" {
+		body, err = json.Marshal(api.AuthLoginRequest{Username: username, Password: password})
+		if err != nil {
+			return "", err
+		}
+	} else {
+		body = nil
+	}
 
-	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
-		return "", reqErr
+	res, err := c.Request("POST", "/v2/auth/login/", body)
+	if err != nil && !drycc.IsErrAPIMismatch(err) {
+		return "", err
 	}
 	defer res.Body.Close()
+	if username != "" && password != "" {
+		login := api.AuthLoginResponse{}
+		if err := json.NewDecoder(res.Body).Decode(&login); err != nil {
+			return "", err
+		}
+		return login.Key, nil
+	}
 
-	URL := res.Header.Get("Location")
-	return URL, reqErr
+	url := res.Header.Get("Location")
+	return url, err
 }
 
 // Token to the controller and get a token
-func Token(c *drycc.Client, key string) (api.AuthLoginResponse, error) {
+func Token(c *drycc.Client, key string) (api.AuthTokenResponse, error) {
 	path := fmt.Sprintf("/v2/auth/token/%s/", key)
 	res, reqErr := c.Request("GET", path, nil)
 	if reqErr != nil && !drycc.IsErrAPIMismatch(reqErr) {
-		return api.AuthLoginResponse{}, reqErr
+		return api.AuthTokenResponse{}, reqErr
 	}
 	defer res.Body.Close()
-	token := api.AuthLoginResponse{}
+	token := api.AuthTokenResponse{}
 	if err := json.NewDecoder(res.Body).Decode(&token); err != nil {
-		return api.AuthLoginResponse{}, err
+		return api.AuthTokenResponse{}, err
 	}
 	return token, reqErr
 }

auth/auth_test.go

@@ -2,6 +2,7 @@ package auth
 
 import (
 	"fmt"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -11,25 +12,37 @@ import (
 	drycc "github.com/drycc/controller-sdk-go"
 )
 
+const keyFixture = "61a7907bf5b34659a14f96371fed2ebc"
+
 type fakeHTTPServer struct {
 }
 
 func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
 	res.Header().Add("DRYCC_API_VERSION", drycc.APIVersion)
 
 	if req.URL.Path == "/v2/auth/login/" && req.Method == "POST" {
-		res.Header().Add("Location", "/v2/login/drycc/?key=fdbf3b34742e4ed2be4dfa848af13007/")
-		res.WriteHeader(http.StatusFound)
-		res.Write(nil)
-		return
+		body, err := io.ReadAll(req.Body)
+
+		if err != nil {
+			fmt.Println(err)
+			res.WriteHeader(http.StatusInternalServerError)
+			res.Write(nil)
+		}
+		if len(body) == 0 {
+			res.Header().Add("Location", fmt.Sprintf("/v2/login/drycc/?key=%s/", keyFixture))
+			res.WriteHeader(http.StatusFound)
+			res.Write(nil)
+		} else {
+			res.WriteHeader(http.StatusFound)
+			res.Write([]byte(fmt.Sprintf(`{"key": "%s"}`, keyFixture)))
+		}
 	}
 
-	if req.URL.Path == "/v2/auth/token/fdbf3b34742e4ed2be4dfa848af13007/" && req.Method == "GET" {
+	if req.URL.Path == "/v2/auth/token/61a7907bf5b34659a14f96371fed2ebc/" && req.Method == "GET" {
 		res.WriteHeader(http.StatusOK)
 		res.Write([]byte(`{"username":"test","token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"}`))
 		return
 	}
-
 	fmt.Printf("Unrecognized URL %s\n", req.URL)
 	res.WriteHeader(http.StatusNotFound)
 	res.Write(nil)
@@ -47,16 +60,25 @@ func TestLogin(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	actual, err := Login(drycc)
+	actual, err := Login(drycc, "", "")
 
 	if err != nil {
 		t.Error(err)
 	}
 
-	expected := "/v2/login/drycc/?key=fdbf3b34742e4ed2be4dfa848af13007/"
+	expected := fmt.Sprintf("/v2/login/drycc/?key=%s/", keyFixture)
 	if actual != expected {
 		t.Errorf("Expected %s, Got %s", expected, actual)
 	}
+
+	actual, err = Login(drycc, "admin", "admin")
+	if err != nil {
+		t.Error(err)
+	}
+	if actual != keyFixture {
+		t.Errorf("Expected %s, Got %s", expected, actual)
+	}
+
 }
 
 func TestToken(t *testing.T) {
@@ -70,12 +92,12 @@ func TestToken(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	expected := api.AuthLoginResponse{
+	expected := api.AuthTokenResponse{
 		Username: "test",
 		Token:    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c",
 	}
 
-	token, err := Token(drycc, "fdbf3b34742e4ed2be4dfa848af13007")
+	token, err := Token(drycc, keyFixture)
 
 	if err != nil {
 		t.Error(err)