Skip to content

feat: use unique OAuth callback path for glean-cli #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steve-calvert-glean merged 1 commit into from
Apr 9, 2026
+4 −4
Merged

feat: use unique OAuth callback path for glean-cli #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions internal/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func Login(ctx context.Context) error {
if err != nil {
return fmt.Errorf("finding callback port: %w", err)
}
redirectURI := fmt.Sprintf("http://127.0.0.1:%d/callback", port)
redirectURI := fmt.Sprintf("http://127.0.0.1:%d/glean-cli-callback", port)

// Always do fresh DCR per login — the redirect URI (port) changes each time.
clientID, clientSecret, err := dcrOrStaticClient(ctx, host, registrationEndpoint, redirectURI)
Expand Down Expand Up @@ -94,7 +94,7 @@ func Login(ctx context.Context) error {
// LocalServerBindAddress and LocalServerCallbackPath must match the
// redirect_uri registered via DCR exactly. oauth2cli constructs the
// redirect URL from LocalServerBindAddress (127.0.0.1:{port}) + path.
LocalServerCallbackPath: "/callback",
LocalServerCallbackPath: "/glean-cli-callback",
LocalServerBindAddress: []string{fmt.Sprintf("127.0.0.1:%d", port)},
LocalServerReadyChan: readyChan,
AuthCodeOptions: []oauth2.AuthCodeOption{oauth2.S256ChallengeOption(verifier)},
Expand Down
4 changes: 2 additions & 2 deletions internal/auth/discovery_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ func TestRegisterClient_Success(t *testing.T) {
}))
defer srv.Close()

cl, err := registerClient(context.Background(), srv.URL, "http://127.0.0.1:9999/callback")
cl, err := registerClient(context.Background(), srv.URL, "http://127.0.0.1:9999/glean-cli-callback")
require.NoError(t, err)
assert.Equal(t, "dyn-client-id", cl.ClientID)
}
Expand All @@ -129,7 +129,7 @@ func TestRegisterClient_WithSecret(t *testing.T) {
}))
defer srv.Close()

cl, err := registerClient(context.Background(), srv.URL, "http://127.0.0.1:9999/callback")
cl, err := registerClient(context.Background(), srv.URL, "http://127.0.0.1:9999/glean-cli-callback")
require.NoError(t, err)
assert.Equal(t, "cs", cl.ClientSecret)
}
Loading