Skip to content

Fix OAuth token refresh for servers with root-based discovery (fixes #3) #6

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

Open
kingsleyzhong wants to merge 1 commit into
base: main
Choose a base branch
from
+327 −0
Open

Fix OAuth token refresh for servers with root-based discovery (fixes #3) #6

Show file tree
Hide file tree
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
313 changes: 313 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions src/lib/auth/oauth-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,27 @@ export interface OAuthTokenResponse {
/**
* Discover OAuth token endpoint from server
* Tries standard well-known endpoints per OAuth 2.0 and OpenID Connect specs
* First tries path-based discovery, then falls back to root-based discovery
* (some servers like Notion host metadata at root instead of path)
*/
export async function discoverTokenEndpoint(serverUrl: string): Promise<string | undefined> {
// Try path-based discovery first (e.g., https://example.com/mcp/.well-known/...)
const discoveryUrls = [
`${serverUrl}/.well-known/oauth-authorization-server`,
`${serverUrl}/.well-known/openid-configuration`,
];

// Add root-based fallback URLs (e.g., https://example.com/.well-known/...)
// Some servers like Notion host OAuth metadata at the root instead of the path
const serverUrlObj = new URL(serverUrl);
const base = `${serverUrlObj.protocol}//${serverUrlObj.host}`;
if (serverUrl !== base && serverUrl !== `${base}/`) {
discoveryUrls.push(
`${base}/.well-known/oauth-authorization-server`,
`${base}/.well-known/openid-configuration`,
);
}

for (const url of discoveryUrls) {
try {
logger.debug(`Trying OAuth discovery at: ${url}`);
Expand Down