Skip to content

Fix oauth well-known paths to retain path and query #733

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
wants to merge 4 commits into from
+8 −4
Closed

Fix oauth well-known paths to retain path and query #733

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abcf91b
Fix oauth-protected-resource to also be path aware
calclavia Jul 4, 2025
c5fcba4
Update auth.ts
calclavia Jul 4, 2025
7b02c5c
Retain URL search parameter
calclavia Jul 6, 2025
3bdecfc
Update auth.ts
calclavia Jul 6, 2025
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
12 changes: 8 additions & 4 deletions src/client/auth.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,10 @@ export async function discoverOAuthProtectedResourceMetadata(
if (opts?.resourceMetadataUrl) {
url = new URL(opts?.resourceMetadataUrl);
} else {
url = new URL("/.well-known/oauth-protected-resource", serverUrl);
const issuer = new URL(serverUrl);
const wellKnownPath = buildWellKnownPath('oauth-protected-resource', issuer.pathname);
url = new URL(wellKnownPath, issuer);
url.search = issuer.search;
}

let response: Response;
Expand Down Expand Up @@ -318,8 +321,8 @@ async function fetchWithCorsRetry(
/**
* Constructs the well-known path for OAuth metadata discovery
*/
function buildWellKnownPath(pathname: string): string {
let wellKnownPath = `/.well-known/oauth-authorization-server${pathname}`;
function buildWellKnownPath(wellKnownPrefix: string, pathname: string): string {
let wellKnownPath = `/.well-known/${wellKnownPrefix}${pathname}`;
if (pathname.endsWith('/')) {
// Strip trailing slash from pathname to avoid double slashes
wellKnownPath = wellKnownPath.slice(0, -1);
Expand Down Expand Up @@ -361,8 +364,9 @@ export async function discoverOAuthMetadata(
const protocolVersion = opts?.protocolVersion ?? LATEST_PROTOCOL_VERSION;

// Try path-aware discovery first (RFC 8414 compliant)
const wellKnownPath = buildWellKnownPath(issuer.pathname);
const wellKnownPath = buildWellKnownPath('oauth-authorization-server', issuer.pathname);
const pathAwareUrl = new URL(wellKnownPath, issuer);
pathAwareUrl.search = issuer.search;
let response = await tryMetadataDiscovery(pathAwareUrl, protocolVersion);

// If path-aware discovery fails with 404, try fallback to root discovery
Expand Down