Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🛂 refactor: Use `discoverAuthorizationServerMetadata` for MCP OAuth (#8723)

Jakub Hrozek6671fcb714ef
diff --git a/packages/api/src/mcp/oauth/handler.ts b/packages/api/src/mcp/oauth/handler.ts
index 99ad4971a7..1c776739f2 100644
--- a/packages/api/src/mcp/oauth/handler.ts
+++ b/packages/api/src/mcp/oauth/handler.ts
@@ -1,10 +1,10 @@
import { randomBytes } from 'crypto';
import { logger } from '@librechat/data-schemas';
import {
- discoverOAuthMetadata,
registerClient,
startAuthorization,
exchangeAuthorization,
+ discoverAuthorizationServerMetadata,
discoverOAuthProtectedResourceMetadata,
} from '@modelcontextprotocol/sdk/client/auth.js';
import { OAuthMetadataSchema } from '@modelcontextprotocol/sdk/shared/auth.js';
@@ -61,7 +61,7 @@ export class MCPOAuthHandler {
// Discover OAuth metadata
logger.debug(`[MCPOAuth] Discovering OAuth metadata from ${authServerUrl}`);
- const rawMetadata = await discoverOAuthMetadata(authServerUrl);
+ const rawMetadata = await discoverAuthorizationServerMetadata(authServerUrl);
if (!rawMetadata) {
logger.error(`[MCPOAuth] Failed to discover OAuth metadata from ${authServerUrl}`);
@@ -466,7 +466,10 @@ export class MCPOAuthHandler {
throw new Error('No token URL available for refresh');
} else {
/** Auto-discover OAuth configuration for refresh */
- const { metadata: oauthMetadata } = await this.discoverMetadata(metadata.serverUrl);
+ const oauthMetadata = await discoverAuthorizationServerMetadata(metadata.serverUrl);
+ if (!oauthMetadata) {
+ throw new Error('Failed to discover OAuth metadata for token refresh');
+ }
if (!oauthMetadata.token_endpoint) {
throw new Error('No token endpoint found in OAuth metadata');
}
@@ -584,7 +587,7 @@ export class MCPOAuthHandler {
}
/** Auto-discover OAuth configuration for refresh */
- const { metadata: oauthMetadata } = await this.discoverMetadata(metadata.serverUrl);
+ const oauthMetadata = await discoverAuthorizationServerMetadata(metadata.serverUrl);
if (!oauthMetadata.token_endpoint) {
throw new Error('No token endpoint found in OAuth metadata');