Skip to content

fix(auth): preserve existing refresh_token when server omits it #2276

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

Closed
Jah-yee wants to merge 1 commit into from
+5 −0
Closed

fix(auth): preserve existing refresh_token when server omits it #2276

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
5 changes: 5 additions & 0 deletions src/mcp/client/auth/oauth2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,6 +458,11 @@ async def _handle_refresh_response(self, response: httpx.Response) -> bool: # p
content = await response.aread()
token_response = OAuthToken.model_validate_json(content)

# Per RFC 6749 Section 6, the server may not return a new refresh_token.
# If the server omits it, preserve the existing refresh_token.
if not token_response.refresh_token and self.context.current_tokens:
token_response.refresh_token = self.context.current_tokens.refresh_token

self.context.current_tokens = token_response
self.context.update_token_expiry(token_response)
await self.context.storage.set_tokens(token_response)
Expand Down
Loading