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
TypeScript aianthropicartifactsawsazurechatgptchatgpt-cloneclaudeclonedeepseekgeminigooglegpt-5librechatmcpo1openairesponses-apivisionwebui
🔑 fix: Honor User-Provided MCP API Key Instead of Forcing OAuth (#13954)
Danny Avilae26ce4713a6e
diff --git a/packages/api/src/mcp/UserConnectionManager.ts b/packages/api/src/mcp/UserConnectionManager.tsindex c083d79979..a995c4ab65 100644--- a/packages/api/src/mcp/UserConnectionManager.ts+++ b/packages/api/src/mcp/UserConnectionManager.ts@@ -643,7 +643,7 @@ export abstract class UserConnectionManager {}): Promise<t.ParsedServerConfig> {if (config.requiresOAuth != null ||- config.apiKey?.source === 'admin' ||+ (config.apiKey != null && config.oauth == null) ||!hasRuntimeUrlPlaceholders(config)) {return config;diff --git a/packages/api/src/mcp/registry/MCPServerInspector.ts b/packages/api/src/mcp/registry/MCPServerInspector.tsindex 4e0b9438e4..91a34ef2e1 100644--- a/packages/api/src/mcp/registry/MCPServerInspector.ts+++ b/packages/api/src/mcp/registry/MCPServerInspector.ts@@ -76,6 +76,9 @@ export class MCPServerInspector {this.config.startup !== false &&!this.config.requiresOAuth &&!hasCustomUserVars(this.config) &&+ // user-provided API key is supplied per-user at connect time; an unauthenticated+ // probe here would 401 against a bearer server and fail inspection+ this.config.apiKey?.source !== 'user' &&!hasRuntimeContextPlaceholders(this.config) &&!this.config.obo) {@@ -126,8 +129,11 @@ export class MCPServerInspector {return;}- // Admin-provided API key means no OAuth flow is needed- if (this.config.apiKey?.source === 'admin') {+ // API key auth (admin- or user-provided) is API-key, not OAuth. A credential-less+ // probe of a bearer server returns the same 401 challenge as an OAuth server, so+ // detection would misclassify it; trust the configured auth method. An explicit+ // `oauth` block still wins if both are somehow set.+ if (this.config.apiKey != null && this.config.oauth == null) {this.config.requiresOAuth = false;return;}diff --git a/packages/api/src/mcp/registry/__tests__/MCPServerInspector.test.ts b/packages/api/src/mcp/registry/__tests__/MCPServerInspector.test.tsindex f6af7b52b8..b61ccf0c79 100644--- a/packages/api/src/mcp/registry/__tests__/MCPServerInspector.test.ts+++ b/packages/api/src/mcp/registry/__tests__/MCPServerInspector.test.ts@@ -341,7 +341,7 @@ describe('MCPServerInspector', () => {expect(result.apiKey?.source).toBe('admin');});- it('should still detect OAuth when apiKey.source is user', async () => {+ it('should set requiresOAuth to false and skip probing when apiKey.source is user', async () => {const rawConfig: t.MCPOptions = {type: 'sse',url: 'https://api.example.com/sse',@@ -351,6 +351,39 @@ describe('MCPServerInspector', () => {},};+ // A credential-less probe of a bearer server returns the same 401 challenge as+ // an OAuth server. Detection must be skipped so the user's API key is honored+ // instead of forcing an OAuth flow.+ mockDetectOAuthRequirement.mockResolvedValue({+ requiresOAuth: true, // This would be returned if called, but it shouldn't be+ method: 'protected-resource-metadata',+ });++ // No connection provided: the user's key is supplied per-user at connect time, so+ // inspection must NOT open an unauthenticated connection (it would 401 and fail save).+ const result = await MCPServerInspector.inspect('test_server', rawConfig);++ expect(mockDetectOAuthRequirement).not.toHaveBeenCalled();+ expect(MCPConnectionFactory.create).not.toHaveBeenCalled();+ expect(result.requiresOAuth).toBe(false);+ expect(result.apiKey?.source).toBe('user');+ });++ it('should honor an explicit oauth block even when a user apiKey is present', async () => {+ const rawConfig: t.MCPOptions = {+ type: 'sse',+ url: 'https://api.example.com/sse',+ apiKey: {+ source: 'user',+ authorization_type: 'bearer',+ },+ oauth: {+ authorization_url: 'https://api.example.com/oauth/authorize',+ token_url: 'https://api.example.com/oauth/token',+ scope: 'read',+ },+ };+mockDetectOAuthRequirement.mockResolvedValue({requiresOAuth: true,method: 'protected-resource-metadata',@@ -358,7 +391,7 @@ describe('MCPServerInspector', () => {const result = await MCPServerInspector.inspect('test_server', rawConfig, mockConnection);- // Should call OAuth detection for user-provided API key+ // An explicit oauth config must take precedence over the apiKey short-circuit.expect(mockDetectOAuthRequirement).toHaveBeenCalled();expect(result.requiresOAuth).toBe(true);});