Skip to content

Fixes for oauth expiry and scopes#9

Open
peicodes wants to merge 4 commits intowarpdotdev/v0.10.0from
pei/oauth-expiry-fixes
Open

Fixes for oauth expiry and scopes#9
peicodes wants to merge 4 commits intowarpdotdev/v0.10.0from
pei/oauth-expiry-fixes

Conversation

@peicodes
Copy link
Copy Markdown

@peicodes peicodes commented Mar 31, 2026

Pulls in:

Hoping these are sufficient to fix the frequent refresh issues we've been seeing with MCP.

I tested this branch locally against warp-internal to ensure core mcp functionality still works

peicodes and others added 4 commits March 31, 2026 11:26
…textprotocol#731)

* fix: include granted scopes in OAuth refresh token request

* docs: document scope forwarding in token refresh flow
This reverts commit 2cd946e.
@peicodes peicodes marked this pull request as ready for review March 31, 2026 15:35
@peicodes peicodes requested a review from vorporeal March 31, 2026 15:36
@peicodes peicodes changed the title [Draft] Fixes for oauth expiry and scopes Fixes for oauth expiry and scopes Mar 31, 2026
Comment on lines +1477 to +1492
// Test URL with single path segment: follow spec priority order
let base_url = Url::parse("https://auth.example.com/tenant1").unwrap();
let urls = AuthorizationManager::generate_discovery_urls(&base_url);
assert_eq!(urls.len(), 3);
assert_eq!(
urls[0].as_str(),
"https://auth.example.com/.well-known/oauth-authorization-server/tenant1"
);
assert_eq!(
urls[1].as_str(),
"https://auth.example.com/.well-known/openid-configuration/tenant1"
);
assert_eq!(
urls[2].as_str(),
"https://auth.example.com/tenant1/.well-known/openid-configuration"
);
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm a bit worried that this actually breaks some non-spec-compliant MCP servers. i believe that there are some which have /mcp in the server path, but don't include that in any form in the oauth authorization server URL.

which/how many MCP servers did you test with? i think either linear or sentry might break (based on my memory of when i was trying to update us to upstream).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants