chore: factorize to oauth_flow

Author: LorrisSaintGenez

.goreleaser.yml

@@ -20,7 +20,7 @@ builds:
           -X github.com/algolia/cli/pkg/version.Version={{.Version}}
           -X github.com/algolia/cli/api/dashboard.DefaultDashboardURL={{ .Env.ALGOLIA_DASHBOARD_URL }}
           -X github.com/algolia/cli/api/dashboard.DefaultAPIURL={{ .Env.ALGOLIA_API_URL }}
-          -X github.com/algolia/cli/pkg/cmd/auth/login.DefaultOAuthClientID={{ .Env.ALGOLIA_OAUTH_CLIENT_ID }}
+          -X github.com/algolia/cli/pkg/auth.DefaultOAuthClientID={{ .Env.ALGOLIA_OAUTH_CLIENT_ID }}
           -X github.com/algolia/cli/api/dashboard.DefaultOAuthScope={{ .Env.ALGOLIA_OAUTH_SCOPE }}
     id: macos
     goos: [darwin]

Makefile

@@ -66,7 +66,7 @@ build:
 		-X=github.com/algolia/cli/pkg/version.Version=$(VERSION) \
 		-X=github.com/algolia/cli/api/dashboard.DefaultDashboardURL=$(ALGOLIA_DASHBOARD_URL) \
 		-X=github.com/algolia/cli/api/dashboard.DefaultAPIURL=$(ALGOLIA_API_URL) \
-		-X=github.com/algolia/cli/pkg/cmd/auth/login.DefaultOAuthClientID=$(ALGOLIA_OAUTH_CLIENT_ID) \
+		-X=github.com/algolia/cli/pkg/auth.DefaultOAuthClientID=$(ALGOLIA_OAUTH_CLIENT_ID) \
 		-X 'github.com/algolia/cli/api/dashboard.DefaultOAuthScope=$(ALGOLIA_OAUTH_SCOPE)'" \
 		-o algolia cmd/algolia/main.go
 .PHONY: build

Taskfile.yml

@@ -18,7 +18,7 @@ tasks:
       -X github.com/algolia/cli/pkg/version.Version={{ .VERSION }}
       -X github.com/algolia/cli/api/dashboard.DefaultDashboardURL=$ALGOLIA_DASHBOARD_URL
       -X github.com/algolia/cli/api/dashboard.DefaultAPIURL=$ALGOLIA_API_URL
-      -X github.com/algolia/cli/pkg/cmd/auth/login.DefaultOAuthClientID=$ALGOLIA_OAUTH_CLIENT_ID
+      -X github.com/algolia/cli/pkg/auth.DefaultOAuthClientID=$ALGOLIA_OAUTH_CLIENT_ID
       -X 'github.com/algolia/cli/api/dashboard.DefaultOAuthScope=$ALGOLIA_OAUTH_SCOPE'"
       -o algolia cmd/algolia/main.go
     vars:

pkg/auth/oauth_flow.go

@@ -2,13 +2,31 @@ package auth
 
 import (
 	"fmt"
+	"os"
 	"os/exec"
 	"runtime"
 
 	"github.com/algolia/cli/api/dashboard"
 	"github.com/algolia/cli/pkg/iostreams"
 )
 
+// DefaultOAuthClientID is injected at build time via ldflags.
+// Override with ALGOLIA_OAUTH_CLIENT_ID environment variable for local development.
+var DefaultOAuthClientID = ""
+
+// OAuthClientID returns the OAuth client ID, preferring the ALGOLIA_OAUTH_CLIENT_ID
+// environment variable over the compiled-in default (set via ldflags).
+func OAuthClientID() string {
+	if v := os.Getenv("ALGOLIA_OAUTH_CLIENT_ID"); v != "" {
+		return v
+	}
+	if DefaultOAuthClientID == "" {
+		fmt.Fprintln(os.Stderr, "fatal: ALGOLIA_OAUTH_CLIENT_ID is not set and no default was compiled in")
+		os.Exit(1)
+	}
+	return DefaultOAuthClientID
+}
+
 // RunOAuth runs the OAuth PKCE flow with a local callback server and returns
 // a valid access token. A local HTTP server is started on a random port to
 // receive the authorization code via redirect — no copy-paste required.

pkg/cmd/auth/login/login.go

@@ -2,7 +2,6 @@ package login
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/MakeNowJust/heredoc"
@@ -18,23 +17,6 @@ import (
 	"github.com/algolia/cli/pkg/validators"
 )
 
-// DefaultOAuthClientID is injected at build time via ldflags.
-// Override with ALGOLIA_OAUTH_CLIENT_ID environment variable for local development.
-var DefaultOAuthClientID = ""
-
-// OAuthClientID returns the OAuth client ID, preferring the ALGOLIA_OAUTH_CLIENT_ID
-// environment variable over the compiled-in default (set via ldflags).
-func OAuthClientID() string {
-	if v := os.Getenv("ALGOLIA_OAUTH_CLIENT_ID"); v != "" {
-		return v
-	}
-	if DefaultOAuthClientID == "" {
-		fmt.Fprintln(os.Stderr, "fatal: ALGOLIA_OAUTH_CLIENT_ID is not set and no default was compiled in")
-		os.Exit(1)
-	}
-	return DefaultOAuthClientID
-}
-
 // LoginOptions holds all options for the login command.
 type LoginOptions struct {
 	IO     *iostreams.IOStreams
@@ -109,7 +91,7 @@ func runLoginCmd(opts *LoginOptions) error {
 // If signup is true, the browser opens to the sign-up page instead of sign-in.
 func RunOAuthFlow(opts *LoginOptions, signup bool) error {
 	cs := opts.IO.ColorScheme()
-	client := opts.NewDashboardClient(OAuthClientID())
+	client := opts.NewDashboardClient(auth.OAuthClientID())
 
 	openBrowser := !opts.NoBrowser
 	accessToken, err := auth.RunOAuth(opts.IO, client, signup, openBrowser)

pkg/cmd/auth/logout/logout.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/algolia/cli/api/dashboard"
 	"github.com/algolia/cli/pkg/auth"
-	"github.com/algolia/cli/pkg/cmd/auth/login"
 	"github.com/algolia/cli/pkg/cmdutil"
 	"github.com/algolia/cli/pkg/iostreams"
 	"github.com/algolia/cli/pkg/validators"
@@ -55,7 +54,7 @@ func runLogoutCmd(opts *LogoutOptions) error {
 		return nil
 	}
 
-	client := opts.NewDashboardClient(login.OAuthClientID())
+	client := opts.NewDashboardClient(auth.OAuthClientID())
 
 	if stored.AccessToken != "" {
 		if err := client.RevokeToken(stored.AccessToken); err != nil {