feat(cli): output auth text on success only

elasticspoon · elasticspoon · commit cd15af818269 · 2024-03-08T15:28:32.000-05:00
It doesn't make sense to output Authing with ...
then fail. This moves the output later in the login
process to prevent that.
diff --git a/cli/login.go b/cli/login.go
@@ -142,17 +142,21 @@ func (r *RootCmd) login() *clibase.Cmd {
 		Handler: func(inv *clibase.Invocation) error {
 			ctx := inv.Context()
 			rawURL := ""
+			var urlSource string
+
 			if len(inv.Args) == 0 {
 				rawURL = r.clientURL.String()
+				urlSource = "flag"
 				if rawURL != "" && rawURL == inv.Environ.Get(envURL) {
-					_, _ = fmt.Fprintf(inv.Stdout, "Attempting to authenticate with environment URL: %s\n", rawURL)
+					urlSource = "environment"
 				}
 			} else {
 				rawURL = inv.Args[0]
+				urlSource = "argument"
 			}
 
 			if url, err := r.createConfig().URL().Read(); rawURL == "" && err == nil {
-				_, _ = fmt.Fprintf(inv.Stdout, "Attempting to authenticate with config URL: %s\n", url)
+				urlSource = "config"
 				rawURL = url
 			}
 
@@ -195,6 +199,9 @@ func (r *RootCmd) login() *clibase.Cmd {
 			if err != nil {
 				return xerrors.Errorf("Failed to check server %q for first user, is the URL correct and is coder accessible from your browser? Error - has initial user: %w", serverURL.String(), err)
 			}
+
+			_, _ = fmt.Fprintf(inv.Stdout, "Attempting to authenticate with %s URL: '%s'\n", urlSource, serverURL)
+
 			if !hasFirstUser {
 				_, _ = fmt.Fprintf(inv.Stdout, Caret+"Your Coder deployment hasn't been set up!\n")
 
diff --git a/cli/login_test.go b/cli/login_test.go
@@ -116,6 +116,7 @@ func TestLogin(t *testing.T) {
 
 		clitest.Start(t, inv)
 
+		pty.ExpectMatch(fmt.Sprintf("Attempting to authenticate with flag URL: '%s'", client.URL.String()))
 		matches := []string{
 			"first user?", "yes",
 			"username", "testuser",
@@ -205,6 +206,7 @@ func TestLogin(t *testing.T) {
 			assert.NoError(t, err)
 		}()
 
+		pty.ExpectMatch(fmt.Sprintf("Attempting to authenticate with argument URL: '%s'", client.URL.String()))
 		pty.ExpectMatch("Paste your token here:")
 		pty.WriteLine(client.SessionToken())
 		if runtime.GOOS != "windows" {
@@ -232,14 +234,9 @@ func TestLogin(t *testing.T) {
 			assert.NoError(t, err)
 		}()
 
-		pty.ExpectMatch(fmt.Sprintf("Attempting to authenticate with config URL: %s", url))
+		pty.ExpectMatch(fmt.Sprintf("Attempting to authenticate with config URL: '%s'", url))
 		pty.ExpectMatch("Paste your token here:")
 		pty.WriteLine(client.SessionToken())
-		if runtime.GOOS != "windows" {
-			// For some reason, the match does not show up on Windows.
-			pty.ExpectMatch(client.SessionToken())
-		}
-		pty.ExpectMatch("Welcome to Coder")
 		<-doneChan
 	})
 
@@ -260,14 +257,9 @@ func TestLogin(t *testing.T) {
 			assert.NoError(t, err)
 		}()
 
-		pty.ExpectMatch(fmt.Sprintf("Attempting to authenticate with environment URL: %s", url))
+		pty.ExpectMatch(fmt.Sprintf("Attempting to authenticate with environment URL: '%s'", url))
 		pty.ExpectMatch("Paste your token here:")
 		pty.WriteLine(client.SessionToken())
-		if runtime.GOOS != "windows" {
-			// For some reason, the match does not show up on Windows.
-			pty.ExpectMatch(client.SessionToken())
-		}
-		pty.ExpectMatch("Welcome to Coder")
 		<-doneChan
 	})
 
