mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-20 01:18:10 +01:00
* chore: move database model methods to /packages/data-schemas * chore: add TypeScript ESLint rule to warn on unused variables * refactor: model imports to streamline access - Consolidated model imports across various files to improve code organization and reduce redundancy. - Updated imports for models such as Assistant, Message, Conversation, and others to a unified import path. - Adjusted middleware and service files to reflect the new import structure, ensuring functionality remains intact. - Enhanced test files to align with the new import paths, maintaining test coverage and integrity. * chore: migrate database models to packages/data-schemas and refactor all direct Mongoose Model usage outside of data-schemas * test: update agent model mocks in unit tests - Added `getAgent` mock to `client.test.js` to enhance test coverage for agent-related functionality. - Removed redundant `getAgent` and `getAgents` mocks from `openai.spec.js` and `responses.unit.spec.js` to streamline test setup and reduce duplication. - Ensured consistency in agent mock implementations across test files. * fix: update types in data-schemas * refactor: enhance type definitions in transaction and spending methods - Updated type definitions in `checkBalance.ts` to use specific request and response types. - Refined `spendTokens.ts` to utilize a new `SpendTxData` interface for better clarity and type safety. - Improved transaction handling in `transaction.ts` by introducing `TransactionResult` and `TxData` interfaces, ensuring consistent data structures across methods. - Adjusted unit tests in `transaction.spec.ts` to accommodate new type definitions and enhance robustness. * refactor: streamline model imports and enhance code organization - Consolidated model imports across various controllers and services to a unified import path, improving code clarity and reducing redundancy. - Updated multiple files to reflect the new import structure, ensuring all functionalities remain intact. - Enhanced overall code organization by removing duplicate import statements and optimizing the usage of model methods. * feat: implement loadAddedAgent and refactor agent loading logic - Introduced `loadAddedAgent` function to handle loading agents from added conversations, supporting multi-convo parallel execution. - Created a new `load.ts` file to encapsulate agent loading functionalities, including `loadEphemeralAgent` and `loadAgent`. - Updated the `index.ts` file to export the new `load` module instead of the deprecated `loadAgent`. - Enhanced type definitions and improved error handling in the agent loading process. - Adjusted unit tests to reflect changes in the agent loading structure and ensure comprehensive coverage. * refactor: enhance balance handling with new update interface - Introduced `IBalanceUpdate` interface to streamline balance update operations across the codebase. - Updated `upsertBalanceFields` method signatures in `balance.ts`, `transaction.ts`, and related tests to utilize the new interface for improved type safety. - Adjusted type imports in `balance.spec.ts` to include `IBalanceUpdate`, ensuring consistency in balance management functionalities. - Enhanced overall code clarity and maintainability by refining type definitions related to balance operations. * feat: add unit tests for loadAgent functionality and enhance agent loading logic - Introduced comprehensive unit tests for the `loadAgent` function, covering various scenarios including null and empty agent IDs, loading of ephemeral agents, and permission checks. - Enhanced the `initializeClient` function by moving `getConvoFiles` to the correct position in the database method exports, ensuring proper functionality. - Improved test coverage for agent loading, including handling of non-existent agents and user permissions. * chore: reorder memory method exports for consistency - Moved `deleteAllUserMemories` to the correct position in the exported memory methods, ensuring a consistent and logical order of method exports in `memory.ts`.
90 lines
3.3 KiB
JavaScript
90 lines
3.3 KiB
JavaScript
const bcrypt = require('bcryptjs');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { errorsToString } = require('librechat-data-provider');
|
|
const { Strategy: PassportLocalStrategy } = require('passport-local');
|
|
const { isEnabled, checkEmailConfig, comparePassword } = require('@librechat/api');
|
|
const { findUser, updateUser } = require('~/models');
|
|
const { loginSchema } = require('./validators');
|
|
|
|
// Unix timestamp for 2024-06-07 15:20:18 Eastern Time
|
|
const verificationEnabledTimestamp = 1717788018;
|
|
|
|
async function validateLoginRequest(req) {
|
|
const { error } = loginSchema.safeParse(req.body);
|
|
return error ? errorsToString(error.errors) : null;
|
|
}
|
|
|
|
async function passportLogin(req, email, password, done) {
|
|
try {
|
|
const validationError = await validateLoginRequest(req);
|
|
if (validationError) {
|
|
logError('Passport Local Strategy - Validation Error', { reqBody: req.body });
|
|
logger.error(`[Login] [Login failed] [Username: ${email}] [Request-IP: ${req.ip}]`);
|
|
return done(null, false, { message: validationError });
|
|
}
|
|
|
|
const user = await findUser({ email: email.trim() }, '+password');
|
|
if (!user) {
|
|
logError('Passport Local Strategy - User Not Found', { email });
|
|
logger.error(`[Login] [Login failed] [Username: ${email}] [Request-IP: ${req.ip}]`);
|
|
return done(null, false, { message: 'Email does not exist.' });
|
|
}
|
|
|
|
if (!user.password) {
|
|
logError('Passport Local Strategy - User has no password', { email });
|
|
logger.error(`[Login] [Login failed] [Username: ${email}] [Request-IP: ${req.ip}]`);
|
|
return done(null, false, { message: 'Email does not exist.' });
|
|
}
|
|
|
|
const isMatch = await comparePassword(user, password, { compare: bcrypt.compare });
|
|
if (!isMatch) {
|
|
logError('Passport Local Strategy - Password does not match', { isMatch });
|
|
logger.error(`[Login] [Login failed] [Username: ${email}] [Request-IP: ${req.ip}]`);
|
|
return done(null, false, { message: 'Incorrect password.' });
|
|
}
|
|
|
|
const emailEnabled = checkEmailConfig();
|
|
const userCreatedAtTimestamp = Math.floor(new Date(user.createdAt).getTime() / 1000);
|
|
|
|
if (
|
|
!emailEnabled &&
|
|
!user.emailVerified &&
|
|
userCreatedAtTimestamp < verificationEnabledTimestamp
|
|
) {
|
|
await updateUser(user._id, { emailVerified: true });
|
|
user.emailVerified = true;
|
|
}
|
|
|
|
const unverifiedAllowed = isEnabled(process.env.ALLOW_UNVERIFIED_EMAIL_LOGIN);
|
|
if (user.expiresAt && unverifiedAllowed) {
|
|
await updateUser(user._id, {});
|
|
}
|
|
|
|
if (!user.emailVerified && !unverifiedAllowed) {
|
|
logError('Passport Local Strategy - Email not verified', { email });
|
|
logger.error(`[Login] [Login failed] [Username: ${email}] [Request-IP: ${req.ip}]`);
|
|
return done(null, user, { message: 'Email not verified.' });
|
|
}
|
|
|
|
logger.info(`[Login] [Login successful] [Username: ${email}] [Request-IP: ${req.ip}]`);
|
|
return done(null, user);
|
|
} catch (err) {
|
|
return done(err);
|
|
}
|
|
}
|
|
|
|
function logError(title, parameters) {
|
|
const entries = Object.entries(parameters).map(([name, value]) => ({ name, value }));
|
|
logger.error(title, { parameters: entries });
|
|
}
|
|
|
|
module.exports = () =>
|
|
new PassportLocalStrategy(
|
|
{
|
|
usernameField: 'email',
|
|
passwordField: 'password',
|
|
session: false,
|
|
passReqToCallback: true,
|
|
},
|
|
passportLogin,
|
|
);
|