Skip to content

Apply the timeout to the auth token inline login #7267

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
maksim-zuev-db merged 3 commits into from
Oct 30, 2026
Merged

Apply the timeout to the auth token inline login #7267

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f36a2f5
Apply the timeout to the auth token inline login
maksim-zuev-db Oct 30, 2026
c0321c9
Add a changelog fragment for the auth token timeout fix
maksim-zuev-db Oct 30, 2026
dc28d3e
Drop the changelog fragment for the auth token timeout fix
maksim-zuev-db Oct 30, 2026
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
9 changes: 6 additions & 3 deletions cmd/auth/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,15 +452,18 @@ func runInlineLogin(ctx context.Context, profiler profile.Profiler, tokenStore s
u2m.WithOAuthArgument(oauthArgument),
u2m.WithBrowser(func(url string) error { return browser.Open(ctx, url) }),
}

// Challenge uses the context passed to NewPersistentAuth, so the timeout
// must be set before it.
ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel()

persistentAuth, err := u2m.NewPersistentAuth(ctx, persistentAuthOpts...)
if err != nil {
return "", nil, err
}
defer persistentAuth.Close()

ctx, cancel := context.WithTimeout(ctx, defaultTimeout)
defer cancel()

token, err := persistentAuth.Challenge()
if err != nil {
return "", nil, err
Expand Down
Loading