chore(auth): add password login

Author: duanhongyi

cmd/auth.go

@@ -14,25 +14,27 @@ import (
 	"github.com/drycc/workflow-cli/settings"
 )
 
-func (d *DryccCmd) doLogin(s settings.Settings) error {
-	URL, err := auth.Login(s.Client)
+func (d *DryccCmd) doLogin(s settings.Settings, username, password string) error {
+	key, err := auth.Login(s.Client, username, password)
 	if d.checkAPICompatibility(s.Client, err) != nil {
 		return err
 	}
 	if err != nil {
 		return nil
 	}
-	fmt.Printf("Opening browser to %s\n", URL)
-	d.Print("Waiting for login... ")
-	err = d.openBrower(URL)
-	if err != nil {
-		d.Print("Cannot open browser, please visit the website in yourself")
-	}
-	u, err := url.Parse(URL)
-	if err != nil {
-		return err
+	if username == "" || password == "" {
+		fmt.Printf("Opening browser to %s\n", key)
+		d.Print("Waiting for login... ")
+		err = d.openBrower(key)
+		if err != nil {
+			d.Print("Cannot open browser, please visit the website in yourself")
+		}
+		u, err := url.Parse(key)
+		if err != nil {
+			return err
+		}
+		key = u.Query()["key"][0]
 	}
-	key := u.Query()["key"][0]
 	quit := progress(d.WOut)
 	d.doToken(s, key)
 	quit <- true
@@ -60,13 +62,13 @@ func (d *DryccCmd) openBrower(URL string) error {
 }
 
 func (d *DryccCmd) doToken(s settings.Settings, key string) error {
-	var token api.AuthLoginResponse
+	var token api.AuthTokenResponse
 	for i := 0; i <= 120; i++ {
 		token, _ = auth.Token(s.Client, key)
-		if token != (api.AuthLoginResponse{}) {
+		time.Sleep(time.Duration(5) * time.Second)
+		if token.Token != "" && token.Username != "" {
 			break
 		}
-		time.Sleep(time.Duration(5) * time.Second)
 	}
 	if token.Token == "" || token.Token == "fail" {
 		d.Printf("Logged fail")
@@ -84,7 +86,7 @@ func (d *DryccCmd) doToken(s settings.Settings, key string) error {
 }
 
 // Login to a Drycc controller.
-func (d *DryccCmd) Login(controller string, sslVerify bool) error {
+func (d *DryccCmd) Login(controller string, sslVerify bool, username, password string) error {
 	c, err := drycc.New(sslVerify, controller, "")
 
 	if err != nil {
@@ -99,7 +101,7 @@ func (d *DryccCmd) Login(controller string, sslVerify bool) error {
 	}
 
 	s := settings.Settings{Client: c}
-	return d.doLogin(s)
+	return d.doLogin(s, username, password)
 }
 
 // Logout from a Drycc controller.

cmd/auth_test.go

@@ -3,13 +3,16 @@ package cmd
 import (
 	"bytes"
 	"fmt"
+	"io"
 	"net/http"
 	"testing"
 
 	"github.com/drycc/workflow-cli/pkg/testutil"
 	"github.com/stretchr/testify/assert"
 )
 
+const keyFixture = "fdbf3b34742e4ed2be4dfa848af13007"
+
 func TestLogin(t *testing.T) {
 	t.Skip("Skip long running tests")
 	cf, server, err := testutil.NewTestServerAndClient()
@@ -26,20 +29,31 @@ func TestLogin(t *testing.T) {
 		fmt.Fprintf(w, `{}`)
 	})
 
-	server.Mux.HandleFunc("/v2/auth/login/", func(w http.ResponseWriter, _ *http.Request) {
-		testutil.SetHeaders(w)
-		w.Header().Add("Location", "/v2/login/drycc/?key=fdbf3b34742e4ed2be4dfa848af13007/")
-		w.WriteHeader(http.StatusOK)
-		w.Write(nil)
+	server.Mux.HandleFunc("/v2/auth/login/", func(w http.ResponseWriter, r *http.Request) {
+		body, err := io.ReadAll(r.Body)
+		if err != nil {
+			fmt.Println(err)
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write(nil)
+		}
+		w.WriteHeader(http.StatusFound)
+		if len(body) == 0 {
+			testutil.SetHeaders(w)
+			w.Header().Add("Location", fmt.Sprintf("/v2/login/drycc/?key=%s/", keyFixture))
+			w.WriteHeader(http.StatusOK)
+			w.Write(nil)
+		} else {
+			w.Write([]byte(fmt.Sprintf(`{"key": "%s"}`, keyFixture)))
+		}
 	})
 
-	server.Mux.HandleFunc("/v2/auth/token/fdbf3b34742e4ed2be4dfa848af13007/", func(w http.ResponseWriter, _ *http.Request) {
+	server.Mux.HandleFunc(fmt.Sprintf("/v2/auth/token/%s/", keyFixture), func(w http.ResponseWriter, _ *http.Request) {
 		testutil.SetHeaders(w)
 		w.WriteHeader(http.StatusOK)
-		w.Write([]byte(`{"username":"test-user","token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"}`))
+		w.Write([]byte(`{"username":"test-user","token":"eaf2d1d85f6b410b81d94bfec159019b"}`))
 		w.Write(nil)
 	})
-	err = cmdr.Login(server.Server.URL, false)
+	err = cmdr.Login(server.Server.URL, false, "", "")
 	assert.NoError(t, err)
 }
 

cmd/cmd.go

@@ -20,7 +20,7 @@ type Commander interface {
 	AutoscaleList(string) error
 	AutoscaleSet(string, string, int, int, int) error
 	AutoscaleUnset(string, string) error
-	Login(string, bool) error
+	Login(string, bool, string, string) error
 	Logout() error
 	Whoami(bool) error
 	BuildsList(string, int) error

go.mod

@@ -5,7 +5,7 @@ go 1.22
 require (
 	github.com/containerd/console v1.0.4
 	github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815
-	github.com/drycc/controller-sdk-go v0.0.0-20240408054437-6ed94b0070f7
+	github.com/drycc/controller-sdk-go v0.0.0-20240412083348-10d3dbba3590
 	github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/stretchr/testify v1.9.0

go.sum

@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815 h1:bWDMxwH3px2JBh6AyO7hdCn/PkvCZXii8TGj7sbtEbQ=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/drycc/controller-sdk-go v0.0.0-20240408054437-6ed94b0070f7 h1:K1P84rQyr1GwC2/82LRmHmc6ocUJFYiyi0XhgdzzL58=
-github.com/drycc/controller-sdk-go v0.0.0-20240408054437-6ed94b0070f7/go.mod h1:RJ0QxVNWhximzfd08+FkZfKzrX7gOp2gsgXfpqVPJZQ=
+github.com/drycc/controller-sdk-go v0.0.0-20240412083348-10d3dbba3590 h1:xzZQEh9kKSCV0cRdWYm6FCITans2lCWG0j4J1jqIelU=
+github.com/drycc/controller-sdk-go v0.0.0-20240412083348-10d3dbba3590/go.mod h1:RJ0QxVNWhximzfd08+FkZfKzrX7gOp2gsgXfpqVPJZQ=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f h1:kgjvUQJeAszDoU1Vo4vTTE92KI8Av3JPb6Qn890niXg=
 github.com/drycc/pkg v0.0.0-20240225112316-78fc9239f51f/go.mod h1:n+QxGif6ha9CEoxVnlipxb9IdmerybcUSzTEDFkvjiA=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=

parser/auth.go

@@ -46,6 +46,10 @@ Arguments:
     a fully-qualified controller URI, e.g. "http://drycc.local3.dryccapp.com/".
 
 Options:
+  --username=<username>
+    provide a username for the account.
+  --password=<password>
+    provide a password for the account.
   --ssl-verify=true
     enables/disables SSL certificate verification for API requests
 `
@@ -58,12 +62,13 @@ Options:
 
 	controller := safeGetString(args, "<controller>")
 	sslVerify := true
-
 	if args["--ssl-verify"] != nil && args["--ssl-verify"].(string) == "false" {
 		sslVerify = false
 	}
+	username := safeGetString(args, "--username")
+	password := safeGetString(args, "--password")
 
-	return cmdr.Login(controller, sslVerify)
+	return cmdr.Login(controller, sslVerify, username, password)
 }
 
 func authLogout(argv []string, cmdr cmd.Commander) error {

parser/auth_test.go

@@ -12,7 +12,7 @@ import (
 // Create fake implementations of each method that return the argument
 // we expect to have called the function (as an error to satisfy the interface).
 
-func (d FakeDryccCmd) Login(string, bool) error {
+func (d FakeDryccCmd) Login(string, bool, string, string) error {
 	return errors.New("auth:login")
 }