refactor(auth): Switch to new API key client

Author: pan93412

cmd/main.go

@@ -2,6 +2,7 @@
 package main
 
 import (
+	"fmt"
 	"os"
 	"time"
 
@@ -54,7 +55,12 @@ func initFactory() *cmdutil.Factory {
 
 	factory.Printer = printer.New()
 
-	factory.AuthClient = auth.NewZeaburWebAppOAuthClient()
+	cbs, err := auth.NewCallbackServer()
+	if err != nil {
+		panic(fmt.Sprintf("failed to create callback server (internal error): %v", err))
+	}
+
+	factory.AuthClient = auth.NewImplicitFlowClient(cbs)
 
 	factory.Prompter = prompt.New()
 

internal/cmd/auth/login/login.go

@@ -87,22 +87,21 @@ func RunLogin(f *cmdutil.Factory, opts *Options) error {
 	if f.Interactive {
 		f.Log.Info("A browser window will be opened for you to login, please confirm")
 		// get token from web
-		token, err = f.AuthClient.Login()
+		token, err := f.AuthClient.GenerateToken(context.Background())
 		if err != nil {
 			return fmt.Errorf("failed to login: %w", err)
 		}
-		tokenString = token.AccessToken
-		f.Config.SetToken(token)
+		tokenString = token
+
+		f.Config.SetTokenString(tokenString)
 	} else {
 		// get token from flag, env or config
 		if tokenString = f.Config.GetTokenString(); tokenString == "" {
 			return fmt.Errorf("please set ZEABUR_TOKEN environment variable or use --token flag to set token")
 		}
 	}
 
-	f.Config.SetTokenString(tokenString)
-
-	f.Log.Debugw("Token", "token", tokenString, "token detail", token)
+	f.Log.Debugw("Token", "token", tokenString)
 
 	// because we just logged in, we need to create a new client
 	f.ApiClient = opts.NewClient(tokenString)

internal/cmd/root/root.go

@@ -56,16 +56,13 @@ func NewCmdRoot(f *cmdutil.Factory, version, commit, date string) (*cobra.Comman
 
 					var (
 						tokenString string
-						token       *oauth2.Token
 						err         error
 					)
 
-					token, err = f.AuthClient.Login()
+					tokenString, err = f.AuthClient.GenerateToken(context.Background())
 					if err != nil {
 						return fmt.Errorf("failed to login: %w", err)
 					}
-					tokenString = token.AccessToken
-					f.Config.SetToken(token)
 					f.Config.SetTokenString(tokenString)
 				}
 				// set up the client
@@ -82,31 +79,6 @@ func NewCmdRoot(f *cmdutil.Factory, version, commit, date string) (*cobra.Comman
 				return fmt.Errorf("failed to save config: %w", err)
 			}
 
-			// refresh the token if the token is from OAuth2 & it's expired
-			// skip help, version and auth commands
-			if cmd.Name() != "help" && cmd.Name() != "version" && cmd.Parent().Name() != "auth" {
-				if f.AutoRefreshToken && f.LoggedIn() && f.Config.GetToken() != nil {
-					if f.Config.GetToken().Expiry.Before(time.Now()) {
-						f.Log.Info("Token is from OAuth2 and it's expired, refreshing it")
-
-						token := f.Config.GetToken()
-						token.Expiry = time.Now()
-						newToken, err := f.AuthClient.RefreshToken(token)
-						if err != nil {
-							return fmt.Errorf("failed to refresh token, it is recommended to logout and login again: %w", err)
-						}
-						f.Config.SetToken(newToken)
-						f.Config.SetTokenString(newToken.AccessToken)
-						f.Log.Debug("New token: ", newToken)
-						if err := f.Config.Write(); err != nil {
-							return fmt.Errorf("failed to save config: %w", err)
-						}
-
-						f.Log.Info("Token refreshed successfully")
-					}
-				}
-			}
-
 			if f.AutoCheckUpdate && !f.Debug && version != "dev" {
 				currentVersion := TrimPrefixV(version)