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

* WIP: app.locals refactoring
WIP: appConfig
fix: update memory configuration retrieval to use getAppConfig based on user role
fix: update comment for AppConfig interface to clarify purpose
🏷️ refactor: Update tests to use getAppConfig for endpoint configurations
ci: Update AppService tests to initialize app config instead of app.locals
ci: Integrate getAppConfig into remaining tests
refactor: Update multer storage destination to use promise-based getAppConfig and improve error handling in tests
refactor: Rename initializeAppConfig to setAppConfig and update related tests
ci: Mock getAppConfig in various tests to provide default configurations
refactor: Update convertMCPToolsToPlugins to use mcpManager for server configuration and adjust related tests
chore: rename `Config/getAppConfig` -> `Config/app`
fix: streamline OpenAI image tools configuration by removing direct appConfig dependency and using function parameters
chore: correct parameter documentation for imageOutputType in ToolService.js
refactor: remove `getCustomConfig` dependency in config route
refactor: update domain validation to use appConfig for allowed domains
refactor: use appConfig registration property
chore: remove app parameter from AppService invocation
refactor: update AppConfig interface to correct registration and turnstile configurations
refactor: remove getCustomConfig dependency and use getAppConfig in PluginController, multer, and MCP services
refactor: replace getCustomConfig with getAppConfig in STTService, TTSService, and related files
refactor: replace getCustomConfig with getAppConfig in Conversation and Message models, update tempChatRetention functions to use AppConfig type
refactor: update getAppConfig calls in Conversation and Message models to include user role for temporary chat expiration
ci: update related tests
refactor: update getAppConfig call in getCustomConfigSpeech to include user role
fix: update appConfig usage to access allowedDomains from actions instead of registration
refactor: enhance AppConfig to include fileStrategies and update related file strategy logic
refactor: update imports to use normalizeEndpointName from @librechat/api and remove redundant definitions
chore: remove deprecated unused RunManager
refactor: get balance config primarily from appConfig
refactor: remove customConfig dependency for appConfig and streamline loadConfigModels logic
refactor: remove getCustomConfig usage and use app config in file citations
refactor: consolidate endpoint loading logic into loadEndpoints function
refactor: update appConfig access to use endpoints structure across various services
refactor: implement custom endpoints configuration and streamline endpoint loading logic
refactor: update getAppConfig call to include user role parameter
refactor: streamline endpoint configuration and enhance appConfig usage across services
refactor: replace getMCPAuthMap with getUserMCPAuthMap and remove unused getCustomConfig file
refactor: add type annotation for loadedEndpoints in loadEndpoints function
refactor: move /services/Files/images/parse to TS API
chore: add missing FILE_CITATIONS permission to IRole interface
refactor: restructure toolkits to TS API
refactor: separate manifest logic into its own module
refactor: consolidate tool loading logic into a new tools module for startup logic
refactor: move interface config logic to TS API
refactor: migrate checkEmailConfig to TypeScript and update imports
refactor: add FunctionTool interface and availableTools to AppConfig
refactor: decouple caching and DB operations from AppService, make part of consolidated `getAppConfig`
WIP: fix tests
* fix: rebase conflicts
* refactor: remove app.locals references
* refactor: replace getBalanceConfig with getAppConfig in various strategies and middleware
* refactor: replace appConfig?.balance with getBalanceConfig in various controllers and clients
* test: add balance configuration to titleConvo method in AgentClient tests
* chore: remove unused `openai-chat-tokens` package
* chore: remove unused imports in initializeMCPs.js
* refactor: update balance configuration to use getAppConfig instead of getBalanceConfig
* refactor: integrate configMiddleware for centralized configuration handling
* refactor: optimize email domain validation by removing unnecessary async calls
* refactor: simplify multer storage configuration by removing async calls
* refactor: reorder imports for better readability in user.js
* refactor: replace getAppConfig calls with req.config for improved performance
* chore: replace getAppConfig calls with req.config in tests for centralized configuration handling
* chore: remove unused override config
* refactor: add configMiddleware to endpoint route and replace getAppConfig with req.config
* chore: remove customConfig parameter from TTSService constructor
* refactor: pass appConfig from request to processFileCitations for improved configuration handling
* refactor: remove configMiddleware from endpoint route and retrieve appConfig directly in getEndpointsConfig if not in `req.config`
* test: add mockAppConfig to processFileCitations tests for improved configuration handling
* fix: pass req.config to hasCustomUserVars and call without await after synchronous refactor
* fix: type safety in useExportConversation
* refactor: retrieve appConfig using getAppConfig in PluginController and remove configMiddleware from plugins route, to avoid always retrieving when plugins are cached
* chore: change `MongoUser` typedef to `IUser`
* fix: Add `user` and `config` fields to ServerRequest and update JSDoc type annotations from Express.Request to ServerRequest
* fix: remove unused setAppConfig mock from Server configuration tests
112 lines
4 KiB
JavaScript
112 lines
4 KiB
JavaScript
const { getBalanceConfig } = require('@librechat/api');
|
|
const { FileSources } = require('librechat-data-provider');
|
|
const { getStrategyFunctions } = require('~/server/services/Files/strategies');
|
|
const { resizeAvatar } = require('~/server/services/Files/images/avatar');
|
|
const { updateUser, createUser, getUserById } = require('~/models');
|
|
const { getAppConfig } = require('~/server/services/Config');
|
|
|
|
/**
|
|
* Updates the avatar URL of an existing user. If the user's avatar URL does not include the query parameter
|
|
* '?manual=true', it updates the user's avatar with the provided URL. For local file storage, it directly updates
|
|
* the avatar URL, while for other storage types, it processes the avatar URL using the specified file strategy.
|
|
*
|
|
* @param {IUser} oldUser - The existing user object that needs to be updated.
|
|
* @param {string} avatarUrl - The new avatar URL to be set for the user.
|
|
*
|
|
* @returns {Promise<void>}
|
|
* The function updates the user's avatar and saves the user object. It does not return any value.
|
|
*
|
|
* @throws {Error} Throws an error if there's an issue saving the updated user object.
|
|
*/
|
|
const handleExistingUser = async (oldUser, avatarUrl) => {
|
|
const fileStrategy = process.env.CDN_PROVIDER;
|
|
const isLocal = fileStrategy === FileSources.local;
|
|
|
|
let updatedAvatar = false;
|
|
const hasManualFlag =
|
|
typeof oldUser?.avatar === 'string' && oldUser.avatar.includes('?manual=true');
|
|
|
|
if (isLocal && (!oldUser?.avatar || !hasManualFlag)) {
|
|
updatedAvatar = avatarUrl;
|
|
} else if (!isLocal && (!oldUser?.avatar || !hasManualFlag)) {
|
|
const userId = oldUser._id;
|
|
const resizedBuffer = await resizeAvatar({
|
|
userId,
|
|
input: avatarUrl,
|
|
});
|
|
const { processAvatar } = getStrategyFunctions(fileStrategy);
|
|
updatedAvatar = await processAvatar({ buffer: resizedBuffer, userId, manual: 'false' });
|
|
}
|
|
|
|
if (updatedAvatar) {
|
|
await updateUser(oldUser._id, { avatar: updatedAvatar });
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Creates a new user with the provided user details. If the file strategy is not local, the avatar URL is
|
|
* processed using the specified file strategy. The new user is saved to the database with the processed or
|
|
* original avatar URL.
|
|
*
|
|
* @param {Object} params - The parameters object for user creation.
|
|
* @param {string} params.email - The email of the new user.
|
|
* @param {string} params.avatarUrl - The avatar URL of the new user.
|
|
* @param {string} params.provider - The provider of the user's account.
|
|
* @param {string} params.providerKey - The key to identify the provider in the user model.
|
|
* @param {string} params.providerId - The provider-specific ID of the user.
|
|
* @param {string} params.username - The username of the new user.
|
|
* @param {string} params.name - The name of the new user.
|
|
* @param {boolean} [params.emailVerified=false] - Optional. Indicates whether the user's email is verified. Defaults to false.
|
|
*
|
|
* @returns {Promise<User>}
|
|
* A promise that resolves to the newly created user object.
|
|
*
|
|
* @throws {Error} Throws an error if there's an issue creating or saving the new user object.
|
|
*/
|
|
const createSocialUser = async ({
|
|
email,
|
|
avatarUrl,
|
|
provider,
|
|
providerKey,
|
|
providerId,
|
|
username,
|
|
name,
|
|
emailVerified,
|
|
}) => {
|
|
const update = {
|
|
email,
|
|
avatar: avatarUrl,
|
|
provider,
|
|
[providerKey]: providerId,
|
|
username,
|
|
name,
|
|
emailVerified,
|
|
};
|
|
|
|
const appConfig = await getAppConfig();
|
|
const balanceConfig = getBalanceConfig(appConfig);
|
|
const newUserId = await createUser(update, balanceConfig);
|
|
const fileStrategy = process.env.CDN_PROVIDER;
|
|
const isLocal = fileStrategy === FileSources.local;
|
|
|
|
if (!isLocal) {
|
|
const resizedBuffer = await resizeAvatar({
|
|
userId: newUserId,
|
|
input: avatarUrl,
|
|
});
|
|
const { processAvatar } = getStrategyFunctions(fileStrategy);
|
|
const avatar = await processAvatar({
|
|
buffer: resizedBuffer,
|
|
userId: newUserId,
|
|
manual: 'false',
|
|
});
|
|
await updateUser(newUserId, { avatar });
|
|
}
|
|
|
|
return await getUserById(newUserId);
|
|
};
|
|
|
|
module.exports = {
|
|
handleExistingUser,
|
|
createSocialUser,
|
|
};
|