Use sink for already logged in output

Author: gtsiolis

cmd/login.go

@@ -2,11 +2,13 @@ package cmd
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/localstack/lstk/internal/api"
 	"github.com/localstack/lstk/internal/auth"
 	"github.com/localstack/lstk/internal/env"
 	"github.com/localstack/lstk/internal/log"
+	"github.com/localstack/lstk/internal/output"
 	"github.com/localstack/lstk/internal/telemetry"
 	"github.com/localstack/lstk/internal/ui"
 	"github.com/localstack/lstk/internal/version"
@@ -23,14 +25,25 @@ func newLoginCmd(cfg *env.Env, tel *telemetry.Client, logger log.Logger) *cobra.
 			if !isInteractiveMode(cfg) {
 				return fmt.Errorf("login requires an interactive terminal")
 			}
+			tokenStorage, err := auth.NewTokenStorage(cfg.ForceFileKeyring, logger)
+			if err != nil {
+				return fmt.Errorf("failed to initialize token storage: %w", err)
+			}
+			sink := output.NewPlainSink(os.Stdout)
+			if cfg.AuthToken != "" {
+				output.EmitNote(sink, "You're already logged in")
+				return nil
+			}
+			if token, err := tokenStorage.GetAuthToken(); err == nil && token != "" {
+				output.EmitNote(sink, "You're already logged in")
+				return nil
+			}
 			platformClient := api.NewPlatformClient(cfg.APIEndpoint, logger)
 			if err := ui.RunLogin(cmd.Context(), version.Version(), platformClient, cfg.AuthToken, cfg.ForceFileKeyring, cfg.WebAppURL, logger); err != nil {
 				return err
 			}
-			if tokenStorage, err := auth.NewTokenStorage(cfg.ForceFileKeyring, logger); err == nil {
-				if token, err := tokenStorage.GetAuthToken(); err == nil && token != "" {
-					tel.SetAuthToken(token)
-				}
+			if token, err := tokenStorage.GetAuthToken(); err == nil && token != "" {
+				tel.SetAuthToken(token)
 			}
 			return nil
 		}),

internal/output/plain_format.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"strings"
 	"time"
+
+	"github.com/localstack/lstk/internal/ui/styles"
 )
 
 // FormatEventLine converts an output event into a single display line.
@@ -116,13 +118,13 @@ func formatAuthEvent(e AuthEvent) string {
 func formatMessageEvent(e MessageEvent) string {
 	switch e.Severity {
 	case SeveritySuccess:
-		return SuccessMarker() + " " + e.Text
+		return styles.Success.Render(SuccessMarker()) + " " + e.Text
 	case SeverityNote:
-		return "> Note: " + e.Text
+		return styles.Secondary.Render(">") + " " + styles.Note.Render("Note:") + " " + e.Text
 	case SeverityWarning:
-		return "> Warning: " + e.Text
+		return styles.Secondary.Render(">") + " " + styles.Warning.Render("Warning:") + " " + e.Text
 	case SeveritySecondary:
-		return e.Text
+		return styles.SecondaryMessage.Render(e.Text)
 	default:
 		return e.Text
 	}

internal/ui/styles/styles.go

@@ -45,7 +45,7 @@ var (
 		Foreground(lipgloss.Color(SuccessColor))
 
 	Note = lipgloss.NewStyle().
-		Foreground(lipgloss.Color("33"))
+		Foreground(lipgloss.Color("69"))
 
 	Warning = lipgloss.NewStyle().
 		Foreground(lipgloss.Color("214"))