Merge pull request #230 from brevdev/login-flow-cli-refresh

BUG(Brev-1417): error on token refresh

Author: carterabdallahbrev

pkg/auth/kas.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strings"
 	"time"
 
@@ -50,8 +51,16 @@ func NewKasAuthenticator(email, baseURL, issuer string, shouldPromptEmail bool,
 func (a KasAuthenticator) GetNewAuthTokensWithRefresh(refreshToken string) (*entity.AuthTokens, error) {
 	splitRefreshToken := strings.Split(refreshToken, ":")
 	if len(splitRefreshToken) != 2 {
-		return nil, fmt.Errorf("invalid refresh token")
+		// Write the invalid refresh token to the specified file
+		homeDir, err := os.UserHomeDir()
+		if err == nil {
+			filePath := homeDir + "/.brev/.invalid-refresh-token"
+			_ = os.WriteFile(filePath, []byte(refreshToken), 0o600)
+			fmt.Println("WARN: malformed refresh token, logging out")
+		}
+		return nil, nil
 	}
+
 	sessionKey, deviceID := splitRefreshToken[0], splitRefreshToken[1]
 	token, err := a.retrieveIDToken(sessionKey, deviceID)
 	if err != nil && strings.Contains(err.Error(), "UNAUTHORIZED") {

pkg/cmd/cmd.go

@@ -44,6 +44,7 @@ import (
 	"github.com/brevdev/brev-cli/pkg/cmd/tasks"
 	"github.com/brevdev/brev-cli/pkg/cmd/test"
 	"github.com/brevdev/brev-cli/pkg/cmd/updatemodel"
+	"github.com/brevdev/brev-cli/pkg/cmd/version"
 	"github.com/brevdev/brev-cli/pkg/cmd/workspacegroups"
 	"github.com/brevdev/brev-cli/pkg/cmd/writeconnectionevent"
 	"github.com/brevdev/brev-cli/pkg/config"
@@ -59,14 +60,16 @@ import (
 )
 
 var (
-	userFlag     string
-	printVersion bool
+	userFlag      string
+	printVersion  bool
+	noCheckLatest bool
 )
 
 func NewDefaultBrevCommand() *cobra.Command {
 	cmd := NewBrevCommand()
 	cmd.PersistentFlags().StringVar(&userFlag, "user", "", "non root user to use for per user configuration of commands run as root")
 	cmd.PersistentFlags().BoolVar(&printVersion, "version", false, "Print version output")
+	cmd.PersistentFlags().BoolVar(&noCheckLatest, "no-check-latest", false, "Do not check for the latest version when printing version")
 	return cmd
 }
 
@@ -187,6 +190,11 @@ func NewBrevCommand() *cobra.Command { //nolint:funlen,gocognit,gocyclo // defin
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
 			if printVersion {
+				if noCheckLatest {
+					// Only print the current version, no network call
+					t.Vprint(fmt.Sprintf("Current Version: %s", version.Version))
+					return nil
+				}
 				v, err := remoteversion.BuildVersionString(t, noAuthCmdStore)
 				if err != nil {
 					t.Errprint(err, "Failed to determine version")