René's URL Explorer Experiment


Title: feat(auth): persist oauth_metadata via TokenStorage to fix refresh after restart by mangibaud33 · Pull Request #2492 · modelcontextprotocol/python-sdk · GitHub

Open Graph Title: feat(auth): persist oauth_metadata via TokenStorage to fix refresh after restart by mangibaud33 · Pull Request #2492 · modelcontextprotocol/python-sdk

X Title: feat(auth): persist oauth_metadata via TokenStorage to fix refresh after restart by mangibaud33 · Pull Request #2492 · modelcontextprotocol/python-sdk

Description: Summary OAuthClientProvider._initialize() restores current_tokens and client_info from storage but not oauth_metadata. After a restart with cached tokens, _refresh_token() loses the authoritative token endpoint discovered during the prior session and falls back to /token — wrong for servers whose token endpoint sits on a non-standard path. This PR makes metadata persistence symmetric with tokens/client_info: optional get_oauth_metadata / set_oauth_metadata methods on TokenStorage, loaded in _initialize, saved after OASM discovery. Closes part of #1318 (Bug 2 — the _refresh_token fallback URL issue). Bug 1 from #1318 (token_expiry_time not restored) is tracked separately in #1784. Repro Concrete case: HubSpot MCP Auth App (mcp.hubspot.com). Its discovery document reports "token_endpoint": "https://mcp.hubspot.com/oauth/v3/token". After completing the initial OAuth flow and storing tokens to disk, a restart causes the next refresh attempt to hit https://mcp.hubspot.com/token (the /token fallback), which returns 404 HTML. The httpx.Response.json() validation then fails, _handle_refresh_response returns False, and the SDK cascades into a full interactive OAuth flow. That flow cannot complete in non-interactive environments (daemons, containers, CI). Fix approach Alternative considered: fetch discovery inline in _initialize via a private httpx.AsyncClient. Rejected — inconsistent with the yield-based flow, complicates testing (would need to mock HTTP in _initialize tests), and can't easily use the same TLS / proxy configuration the host httpx client is using. Chosen: persist oauth_metadata alongside tokens/client_info. Symmetric with existing storage pattern, zero extra HTTP call on hot path, cache survives restarts. Changes src/mcp/client/auth/oauth2.py TokenStorage Protocol: add two methods with default no-op bodies (return None / return). Marked as optional in docstrings. _initialize: load oauth_metadata via getattr(storage, 'get_oauth_metadata', None) — preserves backward compatibility with duck-typed storage implementations predating this API (they return None and the refresh path falls back to the legacy behaviour). async_auth_flow 401 branch: after successful OASM discovery, persist via getattr(storage, 'set_oauth_metadata', None). Removed three obsolete # pragma: no cover markers on lines now exercised by the new tests (_initialize, async_auth_flow._initialize call, async_auth_flow except Exception), per AGENTS.md. tests/client/test_auth.py 5 new tests: Test Purpose test_initialize_restores_oauth_metadata Happy path: _initialize reads metadata from storage into context test_refresh_token_uses_persisted_metadata_endpoint The actual bug: after restart with persisted metadata, _refresh_token uses the correct non-standard endpoint test_initialize_backward_compat_without_metadata_methods Duck-typed legacy storage (no get_oauth_metadata) doesn't raise AttributeError on init test_token_storage_protocol_default_metadata_methods Protocol defaults return None / no-op for subclasses choosing not to override test_auth_flow_discovery_with_legacy_storage_skips_metadata_persistence Full OAuth flow with legacy storage: OASM discovery completes, getattr fallback skips persistence silently MockTokenStorage also updated to implement the two new methods. Backward compatibility Protocol Subclasses: inherit new default no-op implementations automatically. No action required. Duck-typed implementations (matching the 4 required methods without inheriting the Protocol class — the existing MockTokenStorage pattern): continue to work thanks to the getattr fallback in the provider. They will not persist metadata and will re-trigger discovery on each restart, identical to pre-PR behaviour. Zero breaking change for any existing TokenStorage implementation. Test plan uv run --frozen pytest tests/client/test_auth.py — 101 passed uv run --frozen pyright src/mcp/client/auth/oauth2.py tests/client/test_auth.py — 0 errors uv run --frozen ruff format + check — clean coverage report --include='src/mcp/client/auth/oauth2.py' — 99.38% (parity with main baseline; the only missing line is the pre-existing return data, headers in prepare_token_auth, covered by other test files in CI) UV_FROZEN=1 uv run --frozen strict-no-cover — ✅ (removed 3 obsolete pragmas) Verified locally against a running HubSpot MCP Auth App server: gateway reconnect no longer triggers browser OAuth flow. Notes for reviewers Happy to backport to v1.x on request (small diff, no API break). Prior partial PR on the related token_expiry_time bug: #1784. I've commented there offering to help finalize if @keurcien has bandwidth; otherwise I can follow up with a separate rebased PR once this one lands.

Open Graph Description: Summary OAuthClientProvider._initialize() restores current_tokens and client_info from storage but not oauth_metadata. After a restart with cached tokens, _refresh_token() loses the authoritative t...

X Description: Summary OAuthClientProvider._initialize() restores current_tokens and client_info from storage but not oauth_metadata. After a restart with cached tokens, _refresh_token() loses the authoritative t...

Opengraph URL: https://github.com/modelcontextprotocol/python-sdk/pull/2492

X: @github

direct link

Domain: github.com

react-profiling0
react-import-mapreact,react-dom,react-dom/client,react-dom/profiling,react-is,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@b8488ee2c322
route-pattern/:user_id/:repository/pull/:id/files(.:format)
route-controllerpull_requests
route-actionfiles
fetch-noncev2:f62125c1-ec68-15a5-ebd2-5d0d12cfcb37
current-catalog-service-hashae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b
request-idA966:229B2E:1815085:1FBA814:6B013886
html-safe-nonce7ff207a2989167ce140105d391ba113eb9d785a6de11cddfd69508ae23ebc1d4
visitor-payloadeyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJBOTY2OjIyOUIyRToxODE1MDg1OjFGQkE4MTQ6NkIwMTM4ODYiLCJ2aXNpdG9yX2lkIjoiNTk1NDg3OTkyNzU3MTUyNzgxNCIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9
visitor-hmac140e04cfe12ce001d2df64e93c3e87f99da1abe4ecffec14ba37974b63423fdd
hovercard-subject-tagpull_request:3567923016
github-keyboard-shortcutsrepository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot
google-site-verificationApib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I
octolytics-urlhttps://collector.github.com/github/collect
analytics-location///pull_requests/show/files
fb:app_id1401488693436528
apple-itunes-appapp-id=1477376905, app-argument=https://github.com/modelcontextprotocol/python-sdk/pull/2492/files
twitter:imagehttps://avatars.githubusercontent.com/u/276304331?s=400&v=4
twitter:cardsummary_large_image
og:imagehttps://avatars.githubusercontent.com/u/276304331?s=400&v=4
og:image:altSummary OAuthClientProvider._initialize() restores current_tokens and client_info from storage but not oauth_metadata. After a restart with cached tokens, _refresh_token() loses the authoritative t...
og:site_nameGitHub
og:typeobject
hostnamegithub.com
expected-hostnamegithub.com
Nonecc5dfdd32f62ebd3223cab3af3aa2b268d3605218237326a48a99d1efd89495c
turbo-cache-controlno-preview
diff-viewunified
go-importgithub.com/modelcontextprotocol/python-sdk git https://github.com/modelcontextprotocol/python-sdk.git
octolytics-dimension-user_id182288589
octolytics-dimension-user_loginmodelcontextprotocol
octolytics-dimension-repository_id862584018
octolytics-dimension-repository_nwomodelcontextprotocol/python-sdk
octolytics-dimension-repository_publictrue
octolytics-dimension-repository_is_forkfalse
octolytics-dimension-repository_network_root_id862584018
octolytics-dimension-repository_network_root_nwomodelcontextprotocol/python-sdk
turbo-body-classeslogged-out env-production page-responsive full-width
disable-turbotrue
browser-stats-urlhttps://api.github.com/_private/browser/stats
browser-errors-urlhttps://api.github.com/_private/browser/errors
release8c77c9e8439031ad54c75a250694842892f693e1
ui-targetfull
theme-color#1e2327
color-schemelight dark

Links:

Skip to contenthttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files#start-of-content
https://github.com/
Sign inhttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fmodelcontextprotocol%2Fpython-sdk%2Fpull%2F2492%2Ffiles
GitHubRepository hosting, code review, and collaborationhttps://github.com/platform
CopilotAI coding agent for tasks, projects, and automated workhttps://github.com/features/copilot
ActionsCI/CD and automationhttps://github.com/features/actions
Code QualityQuality analysis, fixes, and enforcementhttps://github.com/features/code-quality
CodespacesCloud development environmentshttps://github.com/features/codespaces
Code SecurityVulnerability detection and remediationhttps://github.com/security/advanced-security/code-security
Secret ProtectionSecret scanning and leak preventionhttps://github.com/security/advanced-security/secret-protection
All Featureshttps://github.com/features
Documentationhttps://docs.github.com/en
Traininghttps://learn.github.com/skills
Certificationshttps://learn.github.com/credentials
Build with Copilothttps://github.com/features/ai
Customize Copilothttps://docs.github.com/en/copilot/how-tos/copilot-on-github/customize-copilot/customize-copilot-overview
Integrationshttps://github.com/marketplace
Trending reposhttps://github.com/trending
GitHub Sponsorshttps://github.com/open-source/sponsors
Developer articleshttps://github.com/resources/articles
ChangelogYour source for the latest features, improvements, and fixes across GitHub products, all in one place.https://github.blog/changelog/
Enterpriseshttps://github.com/enterprise
Teamhttps://github.com/team
Startupshttps://github.com/enterprise/startups
Nonprofitshttps://github.com/solutions/industry/nonprofits
Healthcarehttps://github.com/solutions/industry/healthcare
Financial serviceshttps://github.com/solutions/industry/financial-services
Manufacturinghttps://github.com/solutions/industry/manufacturing
Governmenthttps://github.com/solutions/industry/government
See all industrieshttps://github.com/solutions/industry
Why GitHubhttps://github.com/why-github
Customer Storieshttps://github.com/customer-stories
Business insightshttps://github.com/solutions/executive-insights
Trust Centerhttps://github.com/trust-center
GitHub Advanced SecurityEnterprise-grade code securityhttps://github.com/security/advanced-security
Copilot for businessEnterprise-grade AI featureshttps://github.com/features/copilot/copilot-business
Premium SupportEnterprise-grade 24/7 supporthttps://github.com/enterprise/premium-support
Documentationhttps://docs.github.com/en
Resource centerhttps://github.com/resources
Bloghttps://github.blog/
Events & webinarshttps://github.com/resources/events
Community Forumhttps://github.com/orgs/community/discussions
Customer Storieshttps://github.com/customer-stories
Integrationshttps://github.com/marketplace
Customer supporthttps://help.github.com/
Traininghttps://learn.github.com/skills
GitHub Statushttps://www.githubstatus.com/
Abouthttps://github.com/about
Partnershttps://github.com/partners
Changeloghttps://github.blog/changelog/
GitHub UniverseThe event for developers, by developers — talks, workshops, and what’s next for GitHub.https://githubuniverse.com/
Pricinghttps://github.com/pricing
Sign inhttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Fmodelcontextprotocol%2Fpython-sdk%2Fpull%2F2492%2Ffiles
Sign uphttps://github.com/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fpull_requests%2Fshow%2Ffiles&source=header-repo&source_repo=modelcontextprotocol%2Fpython-sdk
Reloadhttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files
Reloadhttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files
Reloadhttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files
modelcontextprotocolhttps://github.com/modelcontextprotocol
python-sdkhttps://github.com/modelcontextprotocol/python-sdk
Codehttps://github.com/modelcontextprotocol/python-sdk
Issues315 (315)https://github.com/modelcontextprotocol/python-sdk/issues
Pull requests112 (112)https://github.com/modelcontextprotocol/python-sdk/pulls
Actionshttps://github.com/modelcontextprotocol/python-sdk/actions
Projectshttps://github.com/modelcontextprotocol/python-sdk/projects
Security and quality12 (12)https://github.com/modelcontextprotocol/python-sdk/security
Insightshttps://github.com/modelcontextprotocol/python-sdk/insights
Sign up for GitHub https://github.com/signup?return_to=%2Fmodelcontextprotocol%2Fpython-sdk%2Fissues%2Fnew%2Fchoose
terms of servicehttps://docs.github.com/terms
privacy statementhttps://docs.github.com/privacy
Sign inhttps://github.com/login?return_to=%2Fmodelcontextprotocol%2Fpython-sdk%2Fissues%2Fnew%2Fchoose
mangibaud33https://github.com/mangibaud33
modelcontextprotocol:mainhttps://github.com/modelcontextprotocol/python-sdk/tree/main
mangibaud33:fix/auth-persist-oauth-metadatahttps://github.com/mangibaud33/python-sdk/tree/fix/auth-persist-oauth-metadata
Conversation 0 https://github.com/modelcontextprotocol/python-sdk/pull/2492
Commits 1 https://github.com/modelcontextprotocol/python-sdk/pull/2492/commits
Checks 0 https://github.com/modelcontextprotocol/python-sdk/pull/2492/checks
Files changed https://github.com/modelcontextprotocol/python-sdk/pull/2492/files
Please reload this pagehttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files
feat(auth): persist oauth_metadata via TokenStorage to fix refresh after restart https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#top
Show all changes 1 commit https://github.com/modelcontextprotocol/python-sdk/pull/2492/files
697c715 feat(auth): persist oauth_metadata via TokenStorage to fix refresh af… mangibaud33 Apr 22, 2026 https://github.com/modelcontextprotocol/python-sdk/pull/2492/commits/697c715741f8632b674edff38fb42bb125bd3d4e
Clear filters https://github.com/modelcontextprotocol/python-sdk/pull/2492/files
Please reload this pagehttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files
Please reload this pagehttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files
oauth2.py https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
test_auth.py https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-f083d075f463e8b1ecfa6b931c33288c3d09b00ee3af3e5f74df16b7e75c3ab1
src/mcp/client/auth/oauth2.pyhttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
View file https://github.com/modelcontextprotocol/python-sdk/blob/697c715741f8632b674edff38fb42bb125bd3d4e/src/mcp/client/auth/oauth2.py
Open in desktop https://desktop.github.com
https://github.co/hiddenchars
https://github.com/modelcontextprotocol/python-sdk/pull/2492/{{ revealButtonHref }}
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-b7aaf2062da175cea9a532176d6eb78b659eaadb757cc48929f0bafccfdb8d98
tests/client/test_auth.pyhttps://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-f083d075f463e8b1ecfa6b931c33288c3d09b00ee3af3e5f74df16b7e75c3ab1
View file https://github.com/modelcontextprotocol/python-sdk/blob/697c715741f8632b674edff38fb42bb125bd3d4e/tests/client/test_auth.py
Open in desktop https://desktop.github.com
https://github.co/hiddenchars
https://github.com/modelcontextprotocol/python-sdk/pull/2492/{{ revealButtonHref }}
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-f083d075f463e8b1ecfa6b931c33288c3d09b00ee3af3e5f74df16b7e75c3ab1
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-f083d075f463e8b1ecfa6b931c33288c3d09b00ee3af3e5f74df16b7e75c3ab1
https://github.com/modelcontextprotocol/python-sdk/pull/2492/files#diff-f083d075f463e8b1ecfa6b931c33288c3d09b00ee3af3e5f74df16b7e75c3ab1
https://github.com
Termshttps://docs.github.com/site-policy/github-terms/github-terms-of-service
Privacyhttps://docs.github.com/site-policy/privacy-policies/github-privacy-statement
Securityhttps://github.com/security
Statushttps://www.githubstatus.com/
Communityhttps://github.community/
Docshttps://docs.github.com/
Contacthttps://support.github.com?tags=dotcom-footer

Viewport: width=device-width


URLs of crawlers that visited me.