mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* 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
136 lines
4 KiB
JavaScript
136 lines
4 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { encrypt, decrypt } = require('@librechat/api');
|
|
const { PluginAuth } = require('~/db/models');
|
|
|
|
/**
|
|
* Asynchronously retrieves and decrypts the authentication value for a user's plugin, based on a specified authentication field.
|
|
*
|
|
* @param {string} userId - The unique identifier of the user for whom the plugin authentication value is to be retrieved.
|
|
* @param {string} authField - The specific authentication field (e.g., 'API_KEY', 'URL') whose value is to be retrieved and decrypted.
|
|
* @param {boolean} throwError - Whether to throw an error if the authentication value does not exist. Defaults to `true`.
|
|
* @returns {Promise<string|null>} A promise that resolves to the decrypted authentication value if found, or `null` if no such authentication value exists for the given user and field.
|
|
*
|
|
* The function throws an error if it encounters any issue during the retrieval or decryption process, or if the authentication value does not exist.
|
|
*
|
|
* @example
|
|
* // To get the decrypted value of the 'token' field for a user with userId '12345':
|
|
* getUserPluginAuthValue('12345', 'token').then(value => {
|
|
* console.log(value);
|
|
* }).catch(err => {
|
|
* console.error(err);
|
|
* });
|
|
*
|
|
* @throws {Error} Throws an error if there's an issue during the retrieval or decryption process, or if the authentication value does not exist.
|
|
* @async
|
|
*/
|
|
const getUserPluginAuthValue = async (userId, authField, throwError = true) => {
|
|
try {
|
|
const pluginAuth = await PluginAuth.findOne({ userId, authField }).lean();
|
|
if (!pluginAuth) {
|
|
throw new Error(`No plugin auth ${authField} found for user ${userId}`);
|
|
}
|
|
|
|
const decryptedValue = await decrypt(pluginAuth.value);
|
|
return decryptedValue;
|
|
} catch (err) {
|
|
if (!throwError) {
|
|
return null;
|
|
}
|
|
logger.error('[getUserPluginAuthValue]', err);
|
|
throw err;
|
|
}
|
|
};
|
|
|
|
// const updateUserPluginAuth = async (userId, authField, pluginKey, value) => {
|
|
// try {
|
|
// const encryptedValue = encrypt(value);
|
|
|
|
// const pluginAuth = await PluginAuth.findOneAndUpdate(
|
|
// { userId, authField },
|
|
// {
|
|
// $set: {
|
|
// value: encryptedValue,
|
|
// pluginKey
|
|
// }
|
|
// },
|
|
// {
|
|
// new: true,
|
|
// upsert: true
|
|
// }
|
|
// );
|
|
|
|
// return pluginAuth;
|
|
// } catch (err) {
|
|
// logger.error('[getUserPluginAuthValue]', err);
|
|
// return err;
|
|
// }
|
|
// };
|
|
|
|
/**
|
|
*
|
|
* @async
|
|
* @param {string} userId
|
|
* @param {string} authField
|
|
* @param {string} pluginKey
|
|
* @param {string} value
|
|
* @returns {Promise<IPluginAuth>}
|
|
* @throws {Error}
|
|
*/
|
|
const updateUserPluginAuth = async (userId, authField, pluginKey, value) => {
|
|
try {
|
|
const encryptedValue = await encrypt(value);
|
|
const pluginAuth = await PluginAuth.findOne({ userId, authField }).lean();
|
|
if (pluginAuth) {
|
|
return await PluginAuth.findOneAndUpdate(
|
|
{ userId, authField },
|
|
{ $set: { value: encryptedValue } },
|
|
{ new: true, upsert: true },
|
|
).lean();
|
|
} else {
|
|
const newPluginAuth = await new PluginAuth({
|
|
userId,
|
|
authField,
|
|
value: encryptedValue,
|
|
pluginKey,
|
|
});
|
|
await newPluginAuth.save();
|
|
return newPluginAuth.toObject();
|
|
}
|
|
} catch (err) {
|
|
logger.error('[updateUserPluginAuth]', err);
|
|
return err;
|
|
}
|
|
};
|
|
|
|
/**
|
|
* @async
|
|
* @param {string} userId
|
|
* @param {string} authField
|
|
* @param {boolean} [all]
|
|
* @returns {Promise<import('mongoose').DeleteResult>}
|
|
* @throws {Error}
|
|
*/
|
|
const deleteUserPluginAuth = async (userId, authField, all = false) => {
|
|
if (all) {
|
|
try {
|
|
const response = await PluginAuth.deleteMany({ userId });
|
|
return response;
|
|
} catch (err) {
|
|
logger.error('[deleteUserPluginAuth]', err);
|
|
return err;
|
|
}
|
|
}
|
|
|
|
try {
|
|
return await PluginAuth.deleteOne({ userId, authField });
|
|
} catch (err) {
|
|
logger.error('[deleteUserPluginAuth]', err);
|
|
return err;
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
getUserPluginAuthValue,
|
|
updateUserPluginAuth,
|
|
deleteUserPluginAuth,
|
|
};
|