fix: prompt before opening browser

Author: yjp20

pkg/cmd/auth.go

@@ -52,15 +52,15 @@ func handleAuthLogin(ctx context.Context, cmd *cli.Command) error {
 	cc := getAPICommandContext(cmd)
 	clientID := cmd.String("client-id")
 	scope := "openapi:read project:write project:read"
-	config, err := startDeviceFlow(ctx, cc.client, clientID, scope)
+	config, err := startDeviceFlow(ctx, cmd, cc.client, clientID, scope)
 	if err != nil {
 		return err
 	}
 	if err := SaveAuthConfig(config); err != nil {
 		Error("Failed to save authentication: %v", err)
 		return fmt.Errorf("authentication failed")
 	}
-	Success("Authentication successful! Your credentials have been saved.")
+	Success("Authentication successful! Your credentials have been saved to.")
 	return nil
 }
 
@@ -179,7 +179,7 @@ func handleAuthStatus(ctx context.Context, cmd *cli.Command) error {
 }
 
 // startDeviceFlow initiates the OAuth 2.0 device flow
-func startDeviceFlow(ctx context.Context, client stainless.Client, clientID, scope string) (*AuthConfig, error) {
+func startDeviceFlow(ctx context.Context, cmd *cli.Command, client stainless.Client, clientID, scope string) (*AuthConfig, error) {
 	var deviceResponse struct {
 		DeviceCode              string `json:"device_code"`
 		UserCode                string `json:"user_code"`
@@ -198,14 +198,20 @@ func startDeviceFlow(ctx context.Context, client stainless.Client, clientID, sco
 		return nil, err
 	}
 
-	if err := browser.OpenURL(deviceResponse.VerificationURIComplete); err != nil {
-		group := Info("To authenticate, visit the verification URL")
-		group.Property("url", deviceResponse.VerificationURI)
-		group.Property("code", deviceResponse.UserCode)
-		group.Property("direct_url", deviceResponse.VerificationURIComplete)
-	} else {
-		group := Info("Browser opened")
-		group.Property("url", deviceResponse.VerificationURIComplete)
+	group := Info("To authenticate, visit the verification URL")
+	group.Property("url", deviceResponse.VerificationURIComplete)
+	group.Property("code", deviceResponse.UserCode)
+
+	ok, _, err := group.Confirm(cmd, "browser", "Open browser?", "", true)
+	if err != nil {
+		return nil, err
+	}
+	if ok {
+		if err := browser.OpenURL(deviceResponse.VerificationURIComplete); err == nil {
+			group.Info("Opening browser...")
+		} else {
+			group.Warn("Could not open browser")
+		}
 	}
 
 	return pollForToken(
@@ -249,7 +255,7 @@ func pollForToken(ctx context.Context, client stainless.Client, clientID, device
 			var apierr *stainless.Error
 			if errors.As(err, &apierr) {
 				// If we got an error, check if it's "authorization_pending" and continue polling
-				errorStr := gjson.Get(apierr.RawJSON(), "error.error").String()
+				errorStr := gjson.Get(apierr.RawJSON(), "error").String()
 				// This is expected, continue polling
 				if errorStr == "authorization_pending" {
 					continue

pkg/cmd/init.go

@@ -101,9 +101,16 @@ func handleInit(ctx context.Context, cmd *cli.Command) error {
 	if len(orgs) == 0 {
 		signupURL := "https://app.stainless.com/signup?source=cli"
 		group := Info("Creating organization for user...")
-		group.Property("signup_url", signupURL)
-		if err := browser.OpenURL(signupURL); err != nil {
-			group.Info("Browser opened")
+		group.Property("url", signupURL)
+
+		ok, err := Confirm(cmd, "browser", "Open browser?", "", true)
+		if err != nil {
+			return err
+		}
+		if ok {
+			if err := browser.OpenURL(signupURL); err != nil {
+				Info("Opening browser...")
+			}
 		}
 
 		group.Progress("Waiting for organization to be created...")

pkg/cmd/print.go

@@ -48,6 +48,11 @@ func Success(format string, args ...any) Group {
 	return Group{}.Success(format, args...)
 }
 
+func Confirm(cmd *cli.Command, flagName, title, description string, defaultValue bool) (bool, error) {
+	value, _, err := Group{}.Confirm(cmd, flagName, title, description, defaultValue)
+	return value, err
+}
+
 func Spacer() {
 	fmt.Fprintf(os.Stderr, "\n")
 }
@@ -138,16 +143,15 @@ func (g Group) Success(format string, args ...any) Group {
 	return Group{prefix: "✓", indent: g.indent + 1}
 }
 
-// Confirm prompts the user with a yes/no question if the flag wasn't explicitly set
-func Confirm(cmd *cli.Command, flagName, title, description string, defaultValue bool) (bool, error) {
+func (g Group) Confirm(cmd *cli.Command, flagName, title, description string, defaultValue bool) (bool, Group, error) {
 	if cmd.IsSet(flagName) {
-		return cmd.Bool(flagName), nil
+		return cmd.Bool(flagName), Group{prefix: "✱", indent: g.indent + 1}, nil
 	}
 
 	foreground := lipgloss.Color("15")
 	cyanBright := lipgloss.Color("6")
 
-	t := GetFormTheme(0)
+	t := GetFormTheme(g.indent)
 	t.Focused.Title = t.Focused.Title.Foreground(foreground)
 	t.Focused.Base = t.Focused.Base.
 		SetString("\b\b" + lipgloss.NewStyle().Foreground(cyanBright).Render("✱")).
@@ -163,5 +167,5 @@ func Confirm(cmd *cli.Command, flagName, title, description string, defaultValue
 		),
 	).WithTheme(t).WithKeyMap(GetFormKeyMap()).Run()
 
-	return value, err
+	return value, Group{prefix: "✱", indent: g.indent + 1}, err
 }