🪐 feat: MCP OAuth 2.0 Discovery Support (#7924)
* chore: Update @modelcontextprotocol/sdk to version 1.12.3 in package.json and package-lock.json
- Bump version of @modelcontextprotocol/sdk to 1.12.3 to incorporate recent updates.
- Update dependencies for ajv and cross-spawn to their latest versions.
- Add ajv as a new dependency in the sdk module.
- Include json-schema-traverse as a new dependency in the sdk module.
* feat: @librechat/auth
* feat: Add crypto module exports to auth package
- Introduced a new crypto module by creating index.ts in the crypto directory.
- Updated the main index.ts of the auth package to export from the new crypto module.
* feat: Update package dependencies and build scripts for auth package
- Added @librechat/auth as a dependency in package.json and package-lock.json.
- Updated build scripts to include the auth package in both frontend and bun build processes.
- Removed unused mongoose and openid-client dependencies from package-lock.json for cleaner dependency management.
* refactor: Migrate crypto utility functions to @librechat/auth
- Replaced local crypto utility imports with the new @librechat/auth package across multiple files.
- Removed the obsolete crypto.js file and its exports.
- Updated relevant services and models to utilize the new encryption and decryption methods from @librechat/auth.
* feat: Enhance OAuth token handling and update dependencies in auth package
* chore: Remove Token model and TokenService due to restructuring of OAuth handling
- Deleted the Token.js model and TokenService.js, which were responsible for managing OAuth tokens.
- This change is part of a broader refactor to streamline OAuth token management and improve code organization.
* refactor: imports from '@librechat/auth' to '@librechat/api' and add OAuth token handling functionality
* refactor: Simplify logger usage in MCP and FlowStateManager classes
* chore: fix imports
* feat: Add OAuth configuration schema to MCP with token exchange method support
* feat: FIRST PASS Implement MCP OAuth flow with token management and error handling
- Added a new route for handling OAuth callbacks and token retrieval.
- Integrated OAuth token storage and retrieval mechanisms.
- Enhanced MCP connection to support automatic OAuth flow initiation on 401 errors.
- Implemented dynamic client registration and metadata discovery for OAuth.
- Updated MCPManager to manage OAuth tokens and handle authentication requirements.
- Introduced comprehensive logging for OAuth processes and error handling.
* refactor: Update MCPConnection and MCPManager to utilize new URL handling
- Added a `url` property to MCPConnection for better URL management.
- Refactored MCPManager to use the new `url` property instead of a deprecated method for OAuth handling.
- Changed logging from info to debug level for flow manager and token methods initialization.
- Improved comments for clarity on existing tokens and OAuth event listener setup.
* refactor: Improve connection timeout error messages in MCPConnection and MCPManager and use initTimeout for connection
- Updated the connection timeout error messages to include the duration of the timeout.
- Introduced a configurable `connectTimeout` variable in both MCPConnection and MCPManager for better flexibility.
* chore: cleanup MCP OAuth Token exchange handling; fix: erroneous use of flowsCache and remove verbose logs
* refactor: Update MCPManager and MCPTokenStorage to use TokenMethods for token management
- Removed direct token storage handling in MCPManager and replaced it with TokenMethods for better abstraction.
- Refactored MCPTokenStorage methods to accept parameters for token operations, enhancing flexibility and readability.
- Improved logging messages related to token persistence and retrieval processes.
* refactor: Update MCP OAuth handling to use static methods and improve flow management
- Refactored MCPOAuthHandler to utilize static methods for initiating and completing OAuth flows, enhancing clarity and reducing instance dependencies.
- Updated MCPManager to pass flowManager explicitly to OAuth handling methods, improving flexibility in flow state management.
- Enhanced comments and logging for better understanding of OAuth processes and flow state retrieval.
* refactor: Integrate token methods into createMCPTool for enhanced token management
* refactor: Change logging from info to debug level in MCPOAuthHandler for improved log management
* chore: clean up logging
* feat: first pass, auth URL from MCP OAuth flow
* chore: Improve logging format for OAuth authentication URL display
* chore: cleanup mcp manager comments
* feat: add connection reconnection logic in MCPManager
* refactor: reorganize token storage handling in MCP
- Moved token storage logic from MCPManager to a new MCPTokenStorage class for better separation of concerns.
- Updated imports to reflect the new token storage structure.
- Enhanced methods for storing, retrieving, updating, and deleting OAuth tokens, improving overall token management.
* chore: update comment for SYSTEM_USER_ID in MCPManager for clarity
* feat: implement refresh token functionality in MCP
- Added refresh token handling in MCPManager to support token renewal for both app-level and user-specific connections.
- Introduced a refreshTokens function to facilitate token refresh logic.
- Enhanced MCPTokenStorage to manage client information and refresh token processes.
- Updated logging for better traceability during token operations.
* chore: cleanup @librechat/auth
* feat: implement MCP server initialization in a separate service
- Added a new service to handle the initialization of MCP servers, improving code organization and readability.
- Refactored the server startup logic to utilize the new initializeMCP function.
- Removed redundant MCP initialization code from the main server file.
* fix: don't log auth url for user connections
* feat: enhance OAuth flow with success and error handling components
- Updated OAuth callback routes to redirect to new success and error pages instead of sending status messages.
- Introduced `OAuthSuccess` and `OAuthError` components to provide user feedback during authentication.
- Added localization support for success and error messages in the translation files.
- Implemented countdown functionality in the success component for a better user experience.
* fix: refresh token handling for user connections, add missing URL and methods
- add standard enum for system user id and helper for determining app-lvel vs. user-level connections
* refactor: update token handling in MCPManager and MCPTokenStorage
* fix: improve error logging in OAuth authentication handler
* fix: concurrency issues for both login url emission and concurrency of oauth flows for shared flows (same user, same server, multiple calls for same server)
* fix: properly fail shared flows for concurrent server calls and prevent duplication of tokens
* chore: remove unused auth package directory from update configuration
* ci: fix mocks in samlStrategy tests
* ci: add mcpConfig to AppService test setup
* chore: remove obsolete MCP OAuth implementation documentation
* fix: update build script for API to use correct command
* chore: bump version of @librechat/api to 1.2.4
* fix: update abort signal handling in createMCPTool function
* fix: add optional clientInfo parameter to refreshTokensFunction metadata
* refactor: replace app.locals.availableTools with getCachedTools in multiple services and controllers for improved tool management
* fix: concurrent refresh token handling issue
* refactor: add signal parameter to getUserConnection method for improved abort handling
* chore: JSDoc typing for `loadEphemeralAgent`
* refactor: update isConnectionActive method to use destructured parameters for improved readability
* feat: implement caching for MCP tools to handle app-level disconnects for loading list of tools
* ci: fix agent test
2025-06-17 13:50:33 -04:00
|
|
|
const { Router } = require('express');
|
|
|
|
const { logger } = require('@librechat/data-schemas');
|
2025-07-21 14:49:19 -07:00
|
|
|
const { MCPOAuthHandler } = require('@librechat/api');
|
|
|
|
const { CacheKeys, Constants } = require('librechat-data-provider');
|
|
|
|
const { findToken, updateToken, createToken, deleteTokens } = require('~/models');
|
|
|
|
const { setCachedTools, getCachedTools, loadCustomConfig } = require('~/server/services/Config');
|
|
|
|
const { getUserPluginAuthValue } = require('~/server/services/PluginService');
|
|
|
|
const { getMCPManager, getFlowStateManager } = require('~/config');
|
🪐 feat: MCP OAuth 2.0 Discovery Support (#7924)
* chore: Update @modelcontextprotocol/sdk to version 1.12.3 in package.json and package-lock.json
- Bump version of @modelcontextprotocol/sdk to 1.12.3 to incorporate recent updates.
- Update dependencies for ajv and cross-spawn to their latest versions.
- Add ajv as a new dependency in the sdk module.
- Include json-schema-traverse as a new dependency in the sdk module.
* feat: @librechat/auth
* feat: Add crypto module exports to auth package
- Introduced a new crypto module by creating index.ts in the crypto directory.
- Updated the main index.ts of the auth package to export from the new crypto module.
* feat: Update package dependencies and build scripts for auth package
- Added @librechat/auth as a dependency in package.json and package-lock.json.
- Updated build scripts to include the auth package in both frontend and bun build processes.
- Removed unused mongoose and openid-client dependencies from package-lock.json for cleaner dependency management.
* refactor: Migrate crypto utility functions to @librechat/auth
- Replaced local crypto utility imports with the new @librechat/auth package across multiple files.
- Removed the obsolete crypto.js file and its exports.
- Updated relevant services and models to utilize the new encryption and decryption methods from @librechat/auth.
* feat: Enhance OAuth token handling and update dependencies in auth package
* chore: Remove Token model and TokenService due to restructuring of OAuth handling
- Deleted the Token.js model and TokenService.js, which were responsible for managing OAuth tokens.
- This change is part of a broader refactor to streamline OAuth token management and improve code organization.
* refactor: imports from '@librechat/auth' to '@librechat/api' and add OAuth token handling functionality
* refactor: Simplify logger usage in MCP and FlowStateManager classes
* chore: fix imports
* feat: Add OAuth configuration schema to MCP with token exchange method support
* feat: FIRST PASS Implement MCP OAuth flow with token management and error handling
- Added a new route for handling OAuth callbacks and token retrieval.
- Integrated OAuth token storage and retrieval mechanisms.
- Enhanced MCP connection to support automatic OAuth flow initiation on 401 errors.
- Implemented dynamic client registration and metadata discovery for OAuth.
- Updated MCPManager to manage OAuth tokens and handle authentication requirements.
- Introduced comprehensive logging for OAuth processes and error handling.
* refactor: Update MCPConnection and MCPManager to utilize new URL handling
- Added a `url` property to MCPConnection for better URL management.
- Refactored MCPManager to use the new `url` property instead of a deprecated method for OAuth handling.
- Changed logging from info to debug level for flow manager and token methods initialization.
- Improved comments for clarity on existing tokens and OAuth event listener setup.
* refactor: Improve connection timeout error messages in MCPConnection and MCPManager and use initTimeout for connection
- Updated the connection timeout error messages to include the duration of the timeout.
- Introduced a configurable `connectTimeout` variable in both MCPConnection and MCPManager for better flexibility.
* chore: cleanup MCP OAuth Token exchange handling; fix: erroneous use of flowsCache and remove verbose logs
* refactor: Update MCPManager and MCPTokenStorage to use TokenMethods for token management
- Removed direct token storage handling in MCPManager and replaced it with TokenMethods for better abstraction.
- Refactored MCPTokenStorage methods to accept parameters for token operations, enhancing flexibility and readability.
- Improved logging messages related to token persistence and retrieval processes.
* refactor: Update MCP OAuth handling to use static methods and improve flow management
- Refactored MCPOAuthHandler to utilize static methods for initiating and completing OAuth flows, enhancing clarity and reducing instance dependencies.
- Updated MCPManager to pass flowManager explicitly to OAuth handling methods, improving flexibility in flow state management.
- Enhanced comments and logging for better understanding of OAuth processes and flow state retrieval.
* refactor: Integrate token methods into createMCPTool for enhanced token management
* refactor: Change logging from info to debug level in MCPOAuthHandler for improved log management
* chore: clean up logging
* feat: first pass, auth URL from MCP OAuth flow
* chore: Improve logging format for OAuth authentication URL display
* chore: cleanup mcp manager comments
* feat: add connection reconnection logic in MCPManager
* refactor: reorganize token storage handling in MCP
- Moved token storage logic from MCPManager to a new MCPTokenStorage class for better separation of concerns.
- Updated imports to reflect the new token storage structure.
- Enhanced methods for storing, retrieving, updating, and deleting OAuth tokens, improving overall token management.
* chore: update comment for SYSTEM_USER_ID in MCPManager for clarity
* feat: implement refresh token functionality in MCP
- Added refresh token handling in MCPManager to support token renewal for both app-level and user-specific connections.
- Introduced a refreshTokens function to facilitate token refresh logic.
- Enhanced MCPTokenStorage to manage client information and refresh token processes.
- Updated logging for better traceability during token operations.
* chore: cleanup @librechat/auth
* feat: implement MCP server initialization in a separate service
- Added a new service to handle the initialization of MCP servers, improving code organization and readability.
- Refactored the server startup logic to utilize the new initializeMCP function.
- Removed redundant MCP initialization code from the main server file.
* fix: don't log auth url for user connections
* feat: enhance OAuth flow with success and error handling components
- Updated OAuth callback routes to redirect to new success and error pages instead of sending status messages.
- Introduced `OAuthSuccess` and `OAuthError` components to provide user feedback during authentication.
- Added localization support for success and error messages in the translation files.
- Implemented countdown functionality in the success component for a better user experience.
* fix: refresh token handling for user connections, add missing URL and methods
- add standard enum for system user id and helper for determining app-lvel vs. user-level connections
* refactor: update token handling in MCPManager and MCPTokenStorage
* fix: improve error logging in OAuth authentication handler
* fix: concurrency issues for both login url emission and concurrency of oauth flows for shared flows (same user, same server, multiple calls for same server)
* fix: properly fail shared flows for concurrent server calls and prevent duplication of tokens
* chore: remove unused auth package directory from update configuration
* ci: fix mocks in samlStrategy tests
* ci: add mcpConfig to AppService test setup
* chore: remove obsolete MCP OAuth implementation documentation
* fix: update build script for API to use correct command
* chore: bump version of @librechat/api to 1.2.4
* fix: update abort signal handling in createMCPTool function
* fix: add optional clientInfo parameter to refreshTokensFunction metadata
* refactor: replace app.locals.availableTools with getCachedTools in multiple services and controllers for improved tool management
* fix: concurrent refresh token handling issue
* refactor: add signal parameter to getUserConnection method for improved abort handling
* chore: JSDoc typing for `loadEphemeralAgent`
* refactor: update isConnectionActive method to use destructured parameters for improved readability
* feat: implement caching for MCP tools to handle app-level disconnects for loading list of tools
* ci: fix agent test
2025-06-17 13:50:33 -04:00
|
|
|
const { requireJwtAuth } = require('~/server/middleware');
|
|
|
|
const { getLogStores } = require('~/cache');
|
|
|
|
|
|
|
|
const router = Router();
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Initiate OAuth flow
|
|
|
|
* This endpoint is called when the user clicks the auth link in the UI
|
|
|
|
*/
|
|
|
|
router.get('/:serverName/oauth/initiate', requireJwtAuth, async (req, res) => {
|
|
|
|
try {
|
|
|
|
const { serverName } = req.params;
|
|
|
|
const { userId, flowId } = req.query;
|
|
|
|
const user = req.user;
|
|
|
|
|
|
|
|
// Verify the userId matches the authenticated user
|
|
|
|
if (userId !== user.id) {
|
|
|
|
return res.status(403).json({ error: 'User mismatch' });
|
|
|
|
}
|
|
|
|
|
|
|
|
logger.debug('[MCP OAuth] Initiate request', { serverName, userId, flowId });
|
|
|
|
|
|
|
|
const flowsCache = getLogStores(CacheKeys.FLOWS);
|
|
|
|
const flowManager = getFlowStateManager(flowsCache);
|
|
|
|
|
|
|
|
/** Flow state to retrieve OAuth config */
|
|
|
|
const flowState = await flowManager.getFlowState(flowId, 'mcp_oauth');
|
|
|
|
if (!flowState) {
|
|
|
|
logger.error('[MCP OAuth] Flow state not found', { flowId });
|
|
|
|
return res.status(404).json({ error: 'Flow not found' });
|
|
|
|
}
|
|
|
|
|
|
|
|
const { serverUrl, oauth: oauthConfig } = flowState.metadata || {};
|
|
|
|
if (!serverUrl || !oauthConfig) {
|
|
|
|
logger.error('[MCP OAuth] Missing server URL or OAuth config in flow state');
|
|
|
|
return res.status(400).json({ error: 'Invalid flow state' });
|
|
|
|
}
|
|
|
|
|
|
|
|
const { authorizationUrl, flowId: oauthFlowId } = await MCPOAuthHandler.initiateOAuthFlow(
|
|
|
|
serverName,
|
|
|
|
serverUrl,
|
|
|
|
userId,
|
|
|
|
oauthConfig,
|
|
|
|
);
|
|
|
|
|
|
|
|
logger.debug('[MCP OAuth] OAuth flow initiated', { oauthFlowId, authorizationUrl });
|
|
|
|
|
|
|
|
// Redirect user to the authorization URL
|
|
|
|
res.redirect(authorizationUrl);
|
|
|
|
} catch (error) {
|
|
|
|
logger.error('[MCP OAuth] Failed to initiate OAuth', error);
|
|
|
|
res.status(500).json({ error: 'Failed to initiate OAuth' });
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
/**
|
|
|
|
* OAuth callback handler
|
|
|
|
* This handles the OAuth callback after the user has authorized the application
|
|
|
|
*/
|
|
|
|
router.get('/:serverName/oauth/callback', async (req, res) => {
|
|
|
|
try {
|
|
|
|
const { serverName } = req.params;
|
|
|
|
const { code, state, error: oauthError } = req.query;
|
|
|
|
|
|
|
|
logger.debug('[MCP OAuth] Callback received', {
|
|
|
|
serverName,
|
|
|
|
code: code ? 'present' : 'missing',
|
|
|
|
state,
|
|
|
|
error: oauthError,
|
|
|
|
});
|
|
|
|
|
|
|
|
if (oauthError) {
|
|
|
|
logger.error('[MCP OAuth] OAuth error received', { error: oauthError });
|
|
|
|
return res.redirect(`/oauth/error?error=${encodeURIComponent(String(oauthError))}`);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!code || typeof code !== 'string') {
|
|
|
|
logger.error('[MCP OAuth] Missing or invalid code');
|
|
|
|
return res.redirect('/oauth/error?error=missing_code');
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!state || typeof state !== 'string') {
|
|
|
|
logger.error('[MCP OAuth] Missing or invalid state');
|
|
|
|
return res.redirect('/oauth/error?error=missing_state');
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract flow ID from state
|
|
|
|
const flowId = state;
|
|
|
|
logger.debug('[MCP OAuth] Using flow ID from state', { flowId });
|
|
|
|
|
|
|
|
const flowsCache = getLogStores(CacheKeys.FLOWS);
|
|
|
|
const flowManager = getFlowStateManager(flowsCache);
|
|
|
|
|
|
|
|
logger.debug('[MCP OAuth] Getting flow state for flowId: ' + flowId);
|
|
|
|
const flowState = await MCPOAuthHandler.getFlowState(flowId, flowManager);
|
|
|
|
|
|
|
|
if (!flowState) {
|
|
|
|
logger.error('[MCP OAuth] Flow state not found for flowId:', flowId);
|
|
|
|
return res.redirect('/oauth/error?error=invalid_state');
|
|
|
|
}
|
|
|
|
|
|
|
|
logger.debug('[MCP OAuth] Flow state details', {
|
|
|
|
serverName: flowState.serverName,
|
|
|
|
userId: flowState.userId,
|
|
|
|
hasMetadata: !!flowState.metadata,
|
|
|
|
hasClientInfo: !!flowState.clientInfo,
|
|
|
|
hasCodeVerifier: !!flowState.codeVerifier,
|
|
|
|
});
|
|
|
|
|
|
|
|
// Complete the OAuth flow
|
|
|
|
logger.debug('[MCP OAuth] Completing OAuth flow');
|
|
|
|
const tokens = await MCPOAuthHandler.completeOAuthFlow(flowId, code, flowManager);
|
|
|
|
logger.info('[MCP OAuth] OAuth flow completed, tokens received in callback route');
|
|
|
|
|
|
|
|
// For system-level OAuth, we need to store the tokens and retry the connection
|
|
|
|
if (flowState.userId === 'system') {
|
|
|
|
logger.debug(`[MCP OAuth] System-level OAuth completed for ${serverName}`);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** ID of the flow that the tool/connection is waiting for */
|
|
|
|
const toolFlowId = flowState.metadata?.toolFlowId;
|
|
|
|
if (toolFlowId) {
|
|
|
|
logger.debug('[MCP OAuth] Completing tool flow', { toolFlowId });
|
|
|
|
await flowManager.completeFlow(toolFlowId, 'mcp_oauth', tokens);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Redirect to success page with flowId and serverName */
|
|
|
|
const redirectUrl = `/oauth/success?serverName=${encodeURIComponent(serverName)}`;
|
|
|
|
res.redirect(redirectUrl);
|
|
|
|
} catch (error) {
|
|
|
|
logger.error('[MCP OAuth] OAuth callback error', error);
|
|
|
|
res.redirect('/oauth/error?error=callback_failed');
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Get OAuth tokens for a completed flow
|
|
|
|
* This is primarily for user-level OAuth flows
|
|
|
|
*/
|
|
|
|
router.get('/oauth/tokens/:flowId', requireJwtAuth, async (req, res) => {
|
|
|
|
try {
|
|
|
|
const { flowId } = req.params;
|
|
|
|
const user = req.user;
|
|
|
|
|
|
|
|
if (!user?.id) {
|
|
|
|
return res.status(401).json({ error: 'User not authenticated' });
|
|
|
|
}
|
|
|
|
|
|
|
|
// Allow system flows or user-owned flows
|
|
|
|
if (!flowId.startsWith(`${user.id}:`) && !flowId.startsWith('system:')) {
|
|
|
|
return res.status(403).json({ error: 'Access denied' });
|
|
|
|
}
|
|
|
|
|
|
|
|
const flowsCache = getLogStores(CacheKeys.FLOWS);
|
|
|
|
const flowManager = getFlowStateManager(flowsCache);
|
|
|
|
|
|
|
|
const flowState = await flowManager.getFlowState(flowId, 'mcp_oauth');
|
|
|
|
if (!flowState) {
|
|
|
|
return res.status(404).json({ error: 'Flow not found' });
|
|
|
|
}
|
|
|
|
|
|
|
|
if (flowState.status !== 'COMPLETED') {
|
|
|
|
return res.status(400).json({ error: 'Flow not completed' });
|
|
|
|
}
|
|
|
|
|
|
|
|
res.json({ tokens: flowState.result });
|
|
|
|
} catch (error) {
|
|
|
|
logger.error('[MCP OAuth] Failed to get tokens', error);
|
|
|
|
res.status(500).json({ error: 'Failed to get tokens' });
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Check OAuth flow status
|
|
|
|
* This endpoint can be used to poll the status of an OAuth flow
|
|
|
|
*/
|
|
|
|
router.get('/oauth/status/:flowId', async (req, res) => {
|
|
|
|
try {
|
|
|
|
const { flowId } = req.params;
|
|
|
|
const flowsCache = getLogStores(CacheKeys.FLOWS);
|
|
|
|
const flowManager = getFlowStateManager(flowsCache);
|
|
|
|
|
|
|
|
const flowState = await flowManager.getFlowState(flowId, 'mcp_oauth');
|
|
|
|
if (!flowState) {
|
|
|
|
return res.status(404).json({ error: 'Flow not found' });
|
|
|
|
}
|
|
|
|
|
|
|
|
res.json({
|
|
|
|
status: flowState.status,
|
|
|
|
completed: flowState.status === 'COMPLETED',
|
|
|
|
failed: flowState.status === 'FAILED',
|
|
|
|
error: flowState.error,
|
|
|
|
});
|
|
|
|
} catch (error) {
|
|
|
|
logger.error('[MCP OAuth] Failed to get flow status', error);
|
|
|
|
res.status(500).json({ error: 'Failed to get flow status' });
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
2025-07-21 14:49:19 -07:00
|
|
|
/**
|
|
|
|
* Reinitialize MCP server
|
|
|
|
* This endpoint allows reinitializing a specific MCP server
|
|
|
|
*/
|
|
|
|
router.post('/:serverName/reinitialize', requireJwtAuth, async (req, res) => {
|
|
|
|
try {
|
|
|
|
const { serverName } = req.params;
|
|
|
|
const user = req.user;
|
|
|
|
|
|
|
|
if (!user?.id) {
|
|
|
|
return res.status(401).json({ error: 'User not authenticated' });
|
|
|
|
}
|
|
|
|
|
|
|
|
logger.info(`[MCP Reinitialize] Reinitializing server: ${serverName}`);
|
|
|
|
|
|
|
|
const config = await loadCustomConfig();
|
|
|
|
if (!config || !config.mcpServers || !config.mcpServers[serverName]) {
|
|
|
|
return res.status(404).json({
|
|
|
|
error: `MCP server '${serverName}' not found in configuration`,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
|
|
|
const flowsCache = getLogStores(CacheKeys.FLOWS);
|
|
|
|
const flowManager = getFlowStateManager(flowsCache);
|
|
|
|
const mcpManager = getMCPManager();
|
|
|
|
|
|
|
|
await mcpManager.disconnectServer(serverName);
|
|
|
|
logger.info(`[MCP Reinitialize] Disconnected existing server: ${serverName}`);
|
|
|
|
|
|
|
|
const serverConfig = config.mcpServers[serverName];
|
|
|
|
mcpManager.mcpConfigs[serverName] = serverConfig;
|
|
|
|
let customUserVars = {};
|
|
|
|
if (serverConfig.customUserVars && typeof serverConfig.customUserVars === 'object') {
|
|
|
|
for (const varName of Object.keys(serverConfig.customUserVars)) {
|
|
|
|
try {
|
|
|
|
const value = await getUserPluginAuthValue(user.id, varName, false);
|
|
|
|
if (value) {
|
|
|
|
customUserVars[varName] = value;
|
|
|
|
}
|
|
|
|
} catch (err) {
|
|
|
|
logger.error(`[MCP Reinitialize] Error fetching ${varName} for user ${user.id}:`, err);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
let userConnection = null;
|
|
|
|
try {
|
|
|
|
userConnection = await mcpManager.getUserConnection({
|
|
|
|
user,
|
|
|
|
serverName,
|
|
|
|
flowManager,
|
|
|
|
customUserVars,
|
|
|
|
tokenMethods: {
|
|
|
|
findToken,
|
|
|
|
updateToken,
|
|
|
|
createToken,
|
|
|
|
deleteTokens,
|
|
|
|
},
|
|
|
|
});
|
|
|
|
} catch (err) {
|
|
|
|
logger.error(`[MCP Reinitialize] Error initializing MCP server ${serverName} for user:`, err);
|
|
|
|
return res.status(500).json({ error: 'Failed to reinitialize MCP server for user' });
|
|
|
|
}
|
|
|
|
|
|
|
|
const userTools = (await getCachedTools({ userId: user.id })) || {};
|
|
|
|
|
|
|
|
// Remove any old tools from this server in the user's cache
|
|
|
|
const mcpDelimiter = Constants.mcp_delimiter;
|
|
|
|
for (const key of Object.keys(userTools)) {
|
|
|
|
if (key.endsWith(`${mcpDelimiter}${serverName}`)) {
|
|
|
|
delete userTools[key];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add the new tools from this server
|
|
|
|
const tools = await userConnection.fetchTools();
|
|
|
|
for (const tool of tools) {
|
|
|
|
const name = `${tool.name}${Constants.mcp_delimiter}${serverName}`;
|
|
|
|
userTools[name] = {
|
|
|
|
type: 'function',
|
|
|
|
['function']: {
|
|
|
|
name,
|
|
|
|
description: tool.description,
|
|
|
|
parameters: tool.inputSchema,
|
|
|
|
},
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
// Save the updated user tool cache
|
|
|
|
await setCachedTools(userTools, { userId: user.id });
|
|
|
|
|
|
|
|
res.json({
|
|
|
|
success: true,
|
|
|
|
message: `MCP server '${serverName}' reinitialized successfully`,
|
|
|
|
serverName,
|
|
|
|
});
|
|
|
|
} catch (error) {
|
|
|
|
logger.error('[MCP Reinitialize] Unexpected error', error);
|
|
|
|
res.status(500).json({ error: 'Internal server error' });
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
🪐 feat: MCP OAuth 2.0 Discovery Support (#7924)
* chore: Update @modelcontextprotocol/sdk to version 1.12.3 in package.json and package-lock.json
- Bump version of @modelcontextprotocol/sdk to 1.12.3 to incorporate recent updates.
- Update dependencies for ajv and cross-spawn to their latest versions.
- Add ajv as a new dependency in the sdk module.
- Include json-schema-traverse as a new dependency in the sdk module.
* feat: @librechat/auth
* feat: Add crypto module exports to auth package
- Introduced a new crypto module by creating index.ts in the crypto directory.
- Updated the main index.ts of the auth package to export from the new crypto module.
* feat: Update package dependencies and build scripts for auth package
- Added @librechat/auth as a dependency in package.json and package-lock.json.
- Updated build scripts to include the auth package in both frontend and bun build processes.
- Removed unused mongoose and openid-client dependencies from package-lock.json for cleaner dependency management.
* refactor: Migrate crypto utility functions to @librechat/auth
- Replaced local crypto utility imports with the new @librechat/auth package across multiple files.
- Removed the obsolete crypto.js file and its exports.
- Updated relevant services and models to utilize the new encryption and decryption methods from @librechat/auth.
* feat: Enhance OAuth token handling and update dependencies in auth package
* chore: Remove Token model and TokenService due to restructuring of OAuth handling
- Deleted the Token.js model and TokenService.js, which were responsible for managing OAuth tokens.
- This change is part of a broader refactor to streamline OAuth token management and improve code organization.
* refactor: imports from '@librechat/auth' to '@librechat/api' and add OAuth token handling functionality
* refactor: Simplify logger usage in MCP and FlowStateManager classes
* chore: fix imports
* feat: Add OAuth configuration schema to MCP with token exchange method support
* feat: FIRST PASS Implement MCP OAuth flow with token management and error handling
- Added a new route for handling OAuth callbacks and token retrieval.
- Integrated OAuth token storage and retrieval mechanisms.
- Enhanced MCP connection to support automatic OAuth flow initiation on 401 errors.
- Implemented dynamic client registration and metadata discovery for OAuth.
- Updated MCPManager to manage OAuth tokens and handle authentication requirements.
- Introduced comprehensive logging for OAuth processes and error handling.
* refactor: Update MCPConnection and MCPManager to utilize new URL handling
- Added a `url` property to MCPConnection for better URL management.
- Refactored MCPManager to use the new `url` property instead of a deprecated method for OAuth handling.
- Changed logging from info to debug level for flow manager and token methods initialization.
- Improved comments for clarity on existing tokens and OAuth event listener setup.
* refactor: Improve connection timeout error messages in MCPConnection and MCPManager and use initTimeout for connection
- Updated the connection timeout error messages to include the duration of the timeout.
- Introduced a configurable `connectTimeout` variable in both MCPConnection and MCPManager for better flexibility.
* chore: cleanup MCP OAuth Token exchange handling; fix: erroneous use of flowsCache and remove verbose logs
* refactor: Update MCPManager and MCPTokenStorage to use TokenMethods for token management
- Removed direct token storage handling in MCPManager and replaced it with TokenMethods for better abstraction.
- Refactored MCPTokenStorage methods to accept parameters for token operations, enhancing flexibility and readability.
- Improved logging messages related to token persistence and retrieval processes.
* refactor: Update MCP OAuth handling to use static methods and improve flow management
- Refactored MCPOAuthHandler to utilize static methods for initiating and completing OAuth flows, enhancing clarity and reducing instance dependencies.
- Updated MCPManager to pass flowManager explicitly to OAuth handling methods, improving flexibility in flow state management.
- Enhanced comments and logging for better understanding of OAuth processes and flow state retrieval.
* refactor: Integrate token methods into createMCPTool for enhanced token management
* refactor: Change logging from info to debug level in MCPOAuthHandler for improved log management
* chore: clean up logging
* feat: first pass, auth URL from MCP OAuth flow
* chore: Improve logging format for OAuth authentication URL display
* chore: cleanup mcp manager comments
* feat: add connection reconnection logic in MCPManager
* refactor: reorganize token storage handling in MCP
- Moved token storage logic from MCPManager to a new MCPTokenStorage class for better separation of concerns.
- Updated imports to reflect the new token storage structure.
- Enhanced methods for storing, retrieving, updating, and deleting OAuth tokens, improving overall token management.
* chore: update comment for SYSTEM_USER_ID in MCPManager for clarity
* feat: implement refresh token functionality in MCP
- Added refresh token handling in MCPManager to support token renewal for both app-level and user-specific connections.
- Introduced a refreshTokens function to facilitate token refresh logic.
- Enhanced MCPTokenStorage to manage client information and refresh token processes.
- Updated logging for better traceability during token operations.
* chore: cleanup @librechat/auth
* feat: implement MCP server initialization in a separate service
- Added a new service to handle the initialization of MCP servers, improving code organization and readability.
- Refactored the server startup logic to utilize the new initializeMCP function.
- Removed redundant MCP initialization code from the main server file.
* fix: don't log auth url for user connections
* feat: enhance OAuth flow with success and error handling components
- Updated OAuth callback routes to redirect to new success and error pages instead of sending status messages.
- Introduced `OAuthSuccess` and `OAuthError` components to provide user feedback during authentication.
- Added localization support for success and error messages in the translation files.
- Implemented countdown functionality in the success component for a better user experience.
* fix: refresh token handling for user connections, add missing URL and methods
- add standard enum for system user id and helper for determining app-lvel vs. user-level connections
* refactor: update token handling in MCPManager and MCPTokenStorage
* fix: improve error logging in OAuth authentication handler
* fix: concurrency issues for both login url emission and concurrency of oauth flows for shared flows (same user, same server, multiple calls for same server)
* fix: properly fail shared flows for concurrent server calls and prevent duplication of tokens
* chore: remove unused auth package directory from update configuration
* ci: fix mocks in samlStrategy tests
* ci: add mcpConfig to AppService test setup
* chore: remove obsolete MCP OAuth implementation documentation
* fix: update build script for API to use correct command
* chore: bump version of @librechat/api to 1.2.4
* fix: update abort signal handling in createMCPTool function
* fix: add optional clientInfo parameter to refreshTokensFunction metadata
* refactor: replace app.locals.availableTools with getCachedTools in multiple services and controllers for improved tool management
* fix: concurrent refresh token handling issue
* refactor: add signal parameter to getUserConnection method for improved abort handling
* chore: JSDoc typing for `loadEphemeralAgent`
* refactor: update isConnectionActive method to use destructured parameters for improved readability
* feat: implement caching for MCP tools to handle app-level disconnects for loading list of tools
* ci: fix agent test
2025-06-17 13:50:33 -04:00
|
|
|
module.exports = router;
|