fix(login): User should login by default when he registers

Author: kmala

cmd/auth.go

@@ -14,7 +14,7 @@ import (
 
 // Register creates a account on a Deis controller.
 func (d *DeisCmd) Register(controller string, username string, password string, email string,
-	sslVerify bool) error {
+	sslVerify, login bool) error {
 
 	c, err := deis.New(sslVerify, controller, "")
 
@@ -72,6 +72,10 @@ func (d *DeisCmd) Register(controller string, username string, password string,
 
 	d.Printf("Registered %s\n", username)
 
+	if login {
+		return d.Login(controller, username, password, sslVerify)
+	}
+
 	return nil
 }
 

cmd/auth_test.go

@@ -51,7 +51,7 @@ func TestRegister(t *testing.T) {
 		fmt.Fprintf(w, `{}`)
 	})
 
-	err = cmdr.Register(server.Server.URL, username, password, email, true)
+	err = cmdr.Register(server.Server.URL, username, password, email, true, false)
 	assert.NoErr(t, err)
 	expected := fmt.Sprintf("Registered %s\n", username)
 

cmd/cmd.go

@@ -21,7 +21,7 @@ type Commander interface {
 	AutoscaleList(string) error
 	AutoscaleSet(string, string, int, int, int) error
 	AutoscaleUnset(string, string) error
-	Register(string, string, string, string, bool) error
+	Register(string, string, string, string, bool, bool) error
 	Login(string, string, string, bool) error
 	Logout() error
 	Passwd(string, string, string) error

parser/auth.go

@@ -81,24 +81,21 @@ Options:
 	password := safeGetValue(args, "--password")
 	email := safeGetValue(args, "--email")
 	sslVerify := true
+	login := true
 
 	if args["--ssl-verify"] != nil && args["--ssl-verify"].(string) == "false" {
 		sslVerify = false
 	}
 
-	if err := cmdr.Register(controller, username, password, email, sslVerify); err != nil {
-		return err
-	}
-
 	// NOTE(bacongobbler): two use cases to check here:
 	//
 	// 1) Legacy; calling `deis auth:register` without --login
-	// 2) calling `deis auth:register --login true`
-	if args["--login"] == nil || args["--login"].(string) == "true" {
-		return cmdr.Login(controller, username, password, sslVerify)
+	// 2) calling `deis auth:register --login false`
+	if args["--login"] != nil && args["--login"].(string) == "false" {
+		login = false
 	}
 
-	return nil
+	return cmdr.Register(controller, username, password, email, sslVerify, login)
 }
 
 func authLogin(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 FakeDeisCmd) Register(string, string, string, string, bool) error {
+func (d FakeDeisCmd) Register(string, string, string, string, bool, bool) error {
 	return errors.New("auth:register")
 }