openclaw/gogcli
openclaw/gogcli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix(auth): preserve remote step 2 replay flags

Browse Source
This commit is contained in:
doodaaatimmy-creator 2026-03-07 08:51:45 -07:00 committed by Peter Steinberger
parent 373f267d3c
commit 4bd27d0d51
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/cmd/auth.go
View File

@ -488,6 +488,30 @@ type AuthAddCmd struct {
GmailScope string `name:"gmail-scope" help:"Gmail scope mode: full|readonly" enum:"full,readonly" default:"full"`
}
func formatRemoteStep2Instruction(services []googleauth.Service, c *AuthAddCmd) string {
parts := []string{"--remote", "--step", "2", "--auth-url", "<redirect-url>"}
if len(services) > 0 {
serialized := make([]string, 0, len(services))
for _, service := range services {
serialized = append(serialized, string(service))
}
parts = append(parts, "--services", strings.Join(serialized, ","))
}
if c.Readonly {
parts = append(parts, "--readonly")
}
if driveScope := strings.ToLower(strings.TrimSpace(c.DriveScope)); driveScope != "" && driveScope != "full" {
parts = append(parts, "--drive-scope", driveScope)
}
if gmailScope := strings.ToLower(strings.TrimSpace(c.GmailScope)); gmailScope != "" && gmailScope != "full" {
parts = append(parts, "--gmail-scope", gmailScope)
}
if c.ForceConsent {
parts = append(parts, "--force-consent")
}
return strings.Join(parts, " ")
}
func (c *AuthAddCmd) Run(ctx context.Context, flags *RootFlags) error {
u := ui.FromContext(ctx)
@ -570,7 +594,7 @@ func (c *AuthAddCmd) Run(ctx context.Context, flags *RootFlags) error {
}
u.Out().Printf("auth_url\t%s", result.URL)
u.Out().Printf("state_reused\t%t", result.StateReused)
u.Err().Println("Run again with --remote --step 2 --auth-url <redirect-url>")
u.Err().Printf("Run again with the same root flags and %s\n", formatRemoteStep2Instruction(services, c))
return nil
case 2:
if authCode != "" {

7
internal/cmd/auth_add_test.go
View File

@ -626,14 +626,16 @@ func TestAuthAddCmd_RemoteStep1_PrintsAuthURL(t *testing.T) {
return nil
}
var stderr string
out := captureStdout(t, func() {
_ = captureStderr(t, func() {
stderr = captureStderr(t, func() {
if err := Execute([]string{
"auth",
"add",
"user@example.com",
"--services",
"gmail",
"--readonly",
"--remote",
"--step",
"1",
@ -652,6 +654,9 @@ func TestAuthAddCmd_RemoteStep1_PrintsAuthURL(t *testing.T) {
if !strings.Contains(out, "state_reused\ttrue") {
t.Fatalf("expected state_reused output, got: %q", out)
}
if !strings.Contains(stderr, "Run again with the same root flags and --remote --step 2 --auth-url <redirect-url> --services gmail --readonly") {
t.Fatalf("expected step 2 guidance to preserve replay flags, got: %q", stderr)
}
}
func TestAuthAddCmd_RemoteStep2_RejectsAuthCode(t *testing.T) {