♻️ Refactor auth flow

Author: OpenWaygate

cmd/auth.go

@@ -26,7 +26,7 @@ var authCmd = &cobra.Command{
 		auth.NewY2BService(
 			auth.WithCredential(credential, pkg.Fsys),
 			auth.WithCacheToken(cacheToken, pkg.Fsys),
-		)
+		).GetService()
 	},
 }
 

pkg/auth/auth.go

@@ -9,6 +9,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/eat-pray-ai/yutu/pkg/utils"
@@ -30,9 +31,9 @@ const (
 	refreshTokenFailed = "failed to refresh token, please re-authenticate in cli"
 	parseSecretFailed  = "failed to parse client secret"
 
-	cacheTokenFile  = "youtube.token.json"
-	credentialFile  = "client_secret.json"
-	manualInputHint = `
+	browserOpenedHint = "Your browser has been opened to an authorization URL. yutu will resume once authorization has been provided.\n%s\n"
+	openBrowserHint   = "It seems that your browser is not open. Go to the following link in your browser:\n%s\n"
+	manualInputHint   = `
 After completing the authorization flow, enter the authorization code on command line.
 
 If you end up in an error page after completing the authorization flow,
@@ -69,26 +70,26 @@ func (s *svc) refreshClient() (client *http.Client) {
 	err := json.Unmarshal([]byte(s.CacheToken), authedToken)
 	if err != nil {
 		client, authedToken = s.newClient(config)
-		if s.Cacheable {
-			s.saveToken(cacheTokenFile, authedToken)
+		if s.tokenFile != "" {
+			s.saveToken(authedToken)
 		}
 		return client
 	}
 
 	if !authedToken.Valid() {
 		tokenSource := config.TokenSource(s.ctx, authedToken)
 		authedToken, err = tokenSource.Token()
-		if err != nil && s.Cacheable {
+		if err != nil && s.tokenFile != "" {
 			client, authedToken = s.newClient(config)
-			s.saveToken(cacheTokenFile, authedToken)
+			s.saveToken(authedToken)
 			return client
 		} else if err != nil {
 			slog.Error(refreshTokenFailed, "error", err)
 			os.Exit(1)
 		}
 
-		if authedToken != nil && s.Cacheable {
-			s.saveToken(cacheTokenFile, authedToken)
+		if authedToken != nil && s.tokenFile != "" {
+			s.saveToken(authedToken)
 		}
 		return config.Client(s.ctx, authedToken)
 	}
@@ -163,10 +164,7 @@ func (s *svc) startWebServer(redirectURL string) chan string {
 }
 
 func (s *svc) getCodeFromPrompt(authURL string) (code string) {
-	fmt.Printf(
-		"It seems that your browser is not open. Go to the following "+
-			"link in your browser:\n%s\n", authURL,
-	)
+	fmt.Printf(openBrowserHint, authURL)
 	fmt.Print(manualInputHint)
 	_, err := fmt.Scan(&code)
 	if err != nil {
@@ -187,19 +185,15 @@ func (s *svc) getTokenFromWeb(
 
 	var code string
 	if err := utils.OpenURL(authURL); err == nil {
-		fmt.Printf(
-			"Your browser has been opened to an authorization URL. This "+
-				"program will resume once authorization has been provided.\n%s\n",
-			authURL,
-		)
+		fmt.Printf(browserOpenedHint, authURL)
 		code = <-codeCh
 	}
 
 	if code == "" {
 		code = s.getCodeFromPrompt(authURL)
 	}
 
-	fmt.Printf("Authorization code generated: %s\n", code)
+	slog.Debug("Authorization code generated", "code", code)
 	token, err := config.Exchange(context.TODO(), code)
 	if err != nil {
 		slog.Error(exchangeFailed, "error", err)
@@ -209,10 +203,16 @@ func (s *svc) getTokenFromWeb(
 	return token
 }
 
-func (s *svc) saveToken(file string, token *oauth2.Token) {
-	f, err := os.OpenFile(file, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
+func (s *svc) saveToken(token *oauth2.Token) {
+	dir := filepath.Dir(s.tokenFile)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		slog.Error(cacheTokenFailed, "dir", dir, "error", err)
+		os.Exit(1)
+	}
+
+	f, err := os.OpenFile(s.tokenFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
 	if err != nil {
-		slog.Error(cacheTokenFailed, "file", file, "error", err)
+		slog.Error(cacheTokenFailed, "file", s.tokenFile, "error", err)
 		os.Exit(1)
 	}
 
@@ -224,4 +224,5 @@ func (s *svc) saveToken(file string, token *oauth2.Token) {
 		slog.Error(cacheTokenFailed, "error", err)
 		os.Exit(1)
 	}
+	slog.Info("Token cached to file", "file", s.tokenFile)
 }

pkg/auth/service.go

@@ -22,11 +22,13 @@ const (
 )
 
 type svc struct {
-	Cacheable  bool   `yaml:"cacheable" json:"cacheable"`
 	Credential string `yaml:"credential" json:"credential"`
 	CacheToken string `yaml:"cache_token" json:"cache_token"`
-	service    *youtube.Service
-	ctx        context.Context
+	credFile   string
+	tokenFile  string
+
+	service *youtube.Service
+	ctx     context.Context
 }
 
 type Svc interface {
@@ -37,14 +39,15 @@ type Svc interface {
 	startWebServer(string) chan string
 	getTokenFromWeb(*oauth2.Config, string) *oauth2.Token
 	getCodeFromPrompt(string) string
-	saveToken(string, *oauth2.Token)
+	saveToken(*oauth2.Token)
 }
 
 type Option func(*svc)
 
 func NewY2BService(opts ...Option) Svc {
 	s := &svc{}
 	s.ctx = context.Background()
+	s.credFile = "client_secret.json"
 
 	for _, opt := range opts {
 		opt(s)
@@ -59,7 +62,7 @@ func WithCredential(cred string, fsys fs.FS) Option {
 		if cred == "" && ok {
 			cred = envCred
 		} else if cred == "" {
-			cred = credentialFile
+			cred = s.credFile
 		}
 		// 1. cred is a file path
 		// 2. cred is a base64 encoded string
@@ -68,7 +71,7 @@ func WithCredential(cred string, fsys fs.FS) Option {
 		relCred, _ := filepath.Rel("/", absCred)
 
 		if _, err := fs.Stat(fsys, relCred); err == nil {
-			// credBytes, err := yfs.ReadFile(cred)
+			s.credFile = absCred
 			credBytes, err := fs.ReadFile(fsys, relCred)
 			if err != nil {
 				slog.Error(
@@ -98,7 +101,7 @@ func WithCacheToken(token string, fsys fs.FS) Option {
 		if token == "" && ok {
 			token = envToken
 		} else if token == "" {
-			token = cacheTokenFile
+			token = "youtube.token.json"
 		}
 
 		// 1. token is a file path
@@ -110,15 +113,13 @@ func WithCacheToken(token string, fsys fs.FS) Option {
 		if _, err := fs.Stat(fsys, relToken); err == nil {
 			tokenBytes, err := fs.ReadFile(fsys, relToken)
 			if err != nil {
-				slog.Error(readTokenFailed, "path", absToken, "error", err)
-				os.Exit(1)
+				slog.Warn(readTokenFailed, "path", absToken, "error", err)
 			}
+			s.tokenFile = absToken
 			s.CacheToken = string(tokenBytes)
-			s.Cacheable = true
 			return
 		} else if os.IsNotExist(err) && strings.HasSuffix(token, ".json") {
-			s.CacheToken = token
-			s.Cacheable = true
+			s.tokenFile = absToken
 			return
 		}
 
@@ -127,8 +128,7 @@ func WithCacheToken(token string, fsys fs.FS) Option {
 		} else if utils.IsJson(token) {
 			s.CacheToken = token
 		} else {
-			slog.Error(parseTokenFailed, "error", err)
-			os.Exit(1)
+			slog.Warn(parseTokenFailed, "error", err)
 		}
 	}
 }