fix(cli): address code review feedback for auth status command

- Add -r shorthand for --remote flag
- Display both remote name and URL for clarity
- Use case-insensitive error string matching
- Fix negative duration display for expired tokens

commit: 3387f72e2ddc47288d6b16713aa6dd42c20cb9e1
author: brice · 8mo ago · 2026-01-29 04:35 UTC
parent: 546e1a6
signature: unsigned

1 file · +20 -14

M internal/adapters/in/cli/auth.go +20 -14


@@ -671,7 +671,7 @@ Examples:
671	671		return runAuthStatus(remoteNameFlag)
672	672		},
673	673		}
674		-	cmd.Flags().StringVar(&remoteNameFlag, "remote", "", "Check specific remote")
	674	+	cmd.Flags().StringVarP(&remoteNameFlag, "remote", "r", "", "Check specific remote")
675	675		return cmd
676	676		}
677	677

@@ -716,24 +716,24 @@ func runAuthStatus(remoteNameArg string) error {
716	716
717	717		// handleAuthVerifyError handles errors from auth verification.
718	718		func handleAuthVerifyError(err error, remoteName, url string) error {
719		-	errStr := err.Error()
	719	+	errStrLower := strings.ToLower(err.Error())
720	720
721	721		// Connection errors
722		-	if strings.Contains(errStr, "connection refused") \|\|
723		-	strings.Contains(errStr, "no such host") \|\|
724		-	strings.Contains(errStr, "timeout") {
	722	+	if strings.Contains(errStrLower, "connection refused") \|\|
	723	+	strings.Contains(errStrLower, "no such host") \|\|
	724	+	strings.Contains(errStrLower, "timeout") {
725	725		fmt.Println(styles.Theme.Bold.Render("Remote: " + url))
726	726		fmt.Println()
727	727		fmt.Println(styles.Theme.Error.Render(styles.IconError + " Connection Failed"))
728		-	fmt.Printf("Error: %s\n\n", errStr)
	728	+	fmt.Printf("Error: %s\n\n", err.Error())
729	729		fmt.Println(styles.Theme.Muted.Render("Check that Gordon server is running and accessible."))
730	730		return nil
731	731		}
732	732
733	733		// Auth errors
734		-	if strings.Contains(errStr, "401") \|\|
735		-	strings.Contains(errStr, "unauthorized") \|\|
736		-	strings.Contains(errStr, "invalid token") {
	734	+	if strings.Contains(errStrLower, "401") \|\|
	735	+	strings.Contains(errStrLower, "unauthorized") \|\|
	736	+	strings.Contains(errStrLower, "invalid token") {
737	737		fmt.Println(styles.Theme.Bold.Render("Remote: " + url))
738	738		fmt.Println()
739	739		fmt.Println(styles.Theme.Error.Render(styles.IconError + " Authentication Failed"))

@@ -750,7 +750,7 @@ func handleAuthVerifyError(err error, remoteName, url string) error {
750	750
751	751		// displayAuthStatus displays authentication status information.
752	752		func displayAuthStatus(remoteName, url string, status *dto.AuthVerifyResponse) {
753		-	fmt.Println(styles.Theme.Bold.Render("Remote: " + url))
	753	+	fmt.Println(styles.Theme.Bold.Render("Remote: " + remoteName + " \| URL: " + url))
754	754		fmt.Println()
755	755
756	756		if status.Valid {

@@ -769,10 +769,16 @@ func displayAuthStatus(remoteName, url string, status *dto.AuthVerifyResponse) {
769	769
770	770		if status.ExpiresAt > 0 {
771	771		expiresAt := time.Unix(status.ExpiresAt, 0)
772		-	remaining := time.Until(expiresAt)
773		-	fmt.Printf("%s %s (%s)\n", styles.Theme.Bold.Render("Expires:"),
774		-	expiresAt.Format("2006-01-02 15:04:05"),
775		-	styles.Theme.Muted.Render(remaining.Round(time.Second).String()))
	772	+	if expiresAt.Before(time.Now()) {
	773	+	fmt.Printf("%s %s (%s ago)\n", styles.Theme.Bold.Render("Expired:"),
	774	+	expiresAt.Format("2006-01-02 15:04:05"),
	775	+	styles.Theme.Muted.Render(time.Since(expiresAt).Round(time.Second).String()))
	776	+	} else {
	777	+	remaining := time.Until(expiresAt)
	778	+	fmt.Printf("%s %s (%s)\n", styles.Theme.Bold.Render("Expires:"),
	779	+	expiresAt.Format("2006-01-02 15:04:05"),
	780	+	styles.Theme.Muted.Render(remaining.Round(time.Second).String()))
	781	+	}
776	782		}
777	783
778	784		if len(status.Scopes) > 0 {

 			return runAuthStatus(remoteNameFlag)
 		},
 	}
-	cmd.Flags().StringVar(&remoteNameFlag, "remote", "", "Check specific remote")
+	cmd.Flags().StringVarP(&remoteNameFlag, "remote", "r", "", "Check specific remote")
 	return cmd
 }
 // handleAuthVerifyError handles errors from auth verification.
 func handleAuthVerifyError(err error, remoteName, url string) error {
-	errStr := err.Error()
+	errStrLower := strings.ToLower(err.Error())
 	// Connection errors
-	if strings.Contains(errStr, "connection refused") ||
+	if strings.Contains(errStrLower, "connection refused") ||
-		strings.Contains(errStr, "no such host") ||
+		strings.Contains(errStrLower, "no such host") ||
-		strings.Contains(errStr, "timeout") {
+		strings.Contains(errStrLower, "timeout") {
 		fmt.Println(styles.Theme.Bold.Render("Remote:  " + url))
 		fmt.Println()
 		fmt.Println(styles.Theme.Error.Render(styles.IconError + " Connection Failed"))
-		fmt.Printf("Error:  %s\n\n", errStr)
+		fmt.Printf("Error:  %s\n\n", err.Error())
 		fmt.Println(styles.Theme.Muted.Render("Check that Gordon server is running and accessible."))
 		return nil
 	}
 	// Auth errors
-	if strings.Contains(errStr, "401") ||
+	if strings.Contains(errStrLower, "401") ||
-		strings.Contains(errStr, "unauthorized") ||
+		strings.Contains(errStrLower, "unauthorized") ||
-		strings.Contains(errStr, "invalid token") {
+		strings.Contains(errStrLower, "invalid token") {
 		fmt.Println(styles.Theme.Bold.Render("Remote:  " + url))
 		fmt.Println()
 		fmt.Println(styles.Theme.Error.Render(styles.IconError + " Authentication Failed"))
 // displayAuthStatus displays authentication status information.
 func displayAuthStatus(remoteName, url string, status *dto.AuthVerifyResponse) {
-	fmt.Println(styles.Theme.Bold.Render("Remote:  " + url))
+	fmt.Println(styles.Theme.Bold.Render("Remote:  " + remoteName + " | URL: " + url))
 	fmt.Println()
 	if status.Valid {
 		if status.ExpiresAt > 0 {
 			expiresAt := time.Unix(status.ExpiresAt, 0)
-			remaining := time.Until(expiresAt)
+			if expiresAt.Before(time.Now()) {
-			fmt.Printf("%s %s (%s)\n", styles.Theme.Bold.Render("Expires:"),
+				fmt.Printf("%s %s (%s ago)\n", styles.Theme.Bold.Render("Expired:"),
-				expiresAt.Format("2006-01-02 15:04:05"),
+					expiresAt.Format("2006-01-02 15:04:05"),
-				styles.Theme.Muted.Render(remaining.Round(time.Second).String()))
+					styles.Theme.Muted.Render(time.Since(expiresAt).Round(time.Second).String()))
+			} else {
+				remaining := time.Until(expiresAt)
+				fmt.Printf("%s %s (%s)\n", styles.Theme.Bold.Render("Expires:"),
+					expiresAt.Format("2006-01-02 15:04:05"),
+					styles.Theme.Muted.Render(remaining.Round(time.Second).String()))
+			}
 		}
 		if len(status.Scopes) > 0 {