Draft
Conversation
catkins
force-pushed
the
catkins/oauth-refresh-tokens
branch
from
2674528 to
83bcd9b
Compare
When the Buildkite API issues short-lived access tokens alongside refresh tokens during OAuth login, the CLI now transparently handles token renewal without user intervention. Key design decisions: - TokenSource + AuthTransport: A shared mutable TokenSource is read by AuthTransport on every request (both REST and GraphQL), so after a refresh all subsequent requests immediately use the new token. This avoids the stale-token problem where cached tokens cause repeated 401s. - Compare-after-lock guard: When multiple concurrent requests get 401s, only the first one performs the refresh. Subsequent goroutines detect that the TokenSource already has a newer token and skip the refresh. This is critical with token rotation where reuse revokes the family. - Selective error handling: Only terminal OAuth errors (invalid_grant, unauthorized_client) clear the stored refresh token. Transient failures (network errors, timeouts) preserve it so the user isn't locked out unnecessarily. - Body buffering: Request bodies are buffered before the first attempt so POST requests (including GraphQL mutations) can be safely replayed on retry after a token refresh. - Debug log redaction: Sensitive values (refresh_token, access_token, code, code_verifier) are redacted in debug output for both form-encoded request bodies and JSON responses. Changes: - pkg/oauth: Add RefreshToken/ExpiresIn to TokenResponse, add RefreshAccessToken() function - pkg/keyring: Add refresh token storage (SetRefreshToken, GetRefreshToken, DeleteRefreshToken) - internal/config: Add RefreshToken()/RefreshTokenForOrg() accessors - internal/http: Add TokenSource, AuthTransport, RefreshTransport - pkg/cmd/factory: Wire shared transport chain, remove cached token from gqlHTTPClient, add body redaction to debug transport - cmd/auth/login: Persist refresh token, show expiry info - cmd/auth/logout: Clear refresh tokens on logout Amp-Thread-ID: https://ampcode.com/threads/T-019d713e-0ddf-736c-a9f3-515d34a7d0e0 Co-authored-by: Amp <amp@ampcode.com>
catkins
force-pushed
the
catkins/oauth-refresh-tokens
branch
from
83bcd9b to
08f2c3c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When the Buildkite API issues short-lived access tokens with refresh tokens during OAuth login, the CLI currently has no way to renew them — every expired token results in a 401 and a manual
bk auth login.This adds transparent refresh token support: expired access tokens are automatically renewed via the OAuth refresh grant without user intervention.
Design
TokenSource: A mutable token holder read byAuthTransporton every request (both REST and GraphQL). After a refresh, all subsequent requests immediately use the new token — no stale cached values.invalid_grant,unauthorized_client) clear the stored refresh token. Transient failures (network, timeouts) preserve it.--debugoutput for both request bodies and responses.Testing
go test ./...)go fmt ./...)golangci-lint run)TokenSourcethread safety,RefreshAccessTokensuccess/errorDisclosures / Credits
This PR was authored with Amp (Claude).