Skip to content

fix: use discoverOAuthFromWWWAuthenticate for reactive OAuth flow (#18760) #19038

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
scidomino merged 5 commits into from
Feb 20, 2026
Merged

fix: use discoverOAuthFromWWWAuthenticate for reactive OAuth flow (#18760) #19038

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e72b076
fix: use discoverOAuthFromWWWAuthenticate for reactive OAuth flow
maximus12793 Feb 13, 2026
8226a9b
test: add tests for discoverOAuthFromWWWAuthenticate in handleAutomat…
maximus12793 Feb 19, 2026
df9c3cb
Merge branch 'main' into fix/oauth-reactive-discovery-18760
maximus12793 Feb 20, 2026
4a04f82
Merge branch 'main' into fix/oauth-reactive-discovery-18760
maximus12793 Feb 20, 2026
f03b4e3
Merge branch 'main' into fix/oauth-reactive-discovery-18760
maximus12793 Feb 20, 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
23 changes: 10 additions & 13 deletions packages/core/src/tools/mcp-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,18 +666,17 @@ async function handleAutomaticOAuth(
try {
debugLogger.log(`🔐 '${mcpServerName}' requires OAuth authentication`);

// Always try to parse the resource metadata URI from the www-authenticate header
let oauthConfig;
const resourceMetadataUri =
OAuthUtils.parseWWWAuthenticateHeader(wwwAuthenticate);
if (resourceMetadataUri) {
oauthConfig = await OAuthUtils.discoverOAuthConfig(resourceMetadataUri);
} else if (hasNetworkTransport(mcpServerConfig)) {
const serverUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;

// Try to discover OAuth config from the WWW-Authenticate header first
let oauthConfig = await OAuthUtils.discoverOAuthFromWWWAuthenticate(
wwwAuthenticate,
serverUrl,
);

if (!oauthConfig && hasNetworkTransport(mcpServerConfig)) {
// Fallback: try to discover OAuth config from the base URL
const serverUrl = new URL(
mcpServerConfig.httpUrl || mcpServerConfig.url!,
);
const baseUrl = `${serverUrl.protocol}//${serverUrl.host}`;
const baseUrl = OAuthUtils.extractBaseUrl(serverUrl!);
oauthConfig = await OAuthUtils.discoverOAuthConfig(baseUrl);
}

Expand All @@ -700,8 +699,6 @@ async function handleAutomaticOAuth(
};

// Perform OAuth authentication
// Pass the server URL for proper discovery
const serverUrl = mcpServerConfig.httpUrl || mcpServerConfig.url;
debugLogger.log(
`Starting OAuth authentication for server '${mcpServerName}'...`,
);
Expand Down