mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-19 17:08: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`.
128 lines
3.8 KiB
JavaScript
128 lines
3.8 KiB
JavaScript
const express = require('express');
|
|
const passport = require('passport');
|
|
const { randomState } = require('openid-client');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const { CacheKeys } = require('librechat-data-provider');
|
|
const {
|
|
requireAdmin,
|
|
getAdminPanelUrl,
|
|
exchangeAdminCode,
|
|
createSetBalanceConfig,
|
|
} = require('@librechat/api');
|
|
const { loginController } = require('~/server/controllers/auth/LoginController');
|
|
const { createOAuthHandler } = require('~/server/controllers/auth/oauth');
|
|
const { findBalanceByUser, upsertBalanceFields } = require('~/models');
|
|
const { getAppConfig } = require('~/server/services/Config');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
const { getOpenIdConfig } = require('~/strategies');
|
|
const middleware = require('~/server/middleware');
|
|
|
|
const setBalanceConfig = createSetBalanceConfig({
|
|
getAppConfig,
|
|
findBalanceByUser,
|
|
upsertBalanceFields,
|
|
});
|
|
|
|
const router = express.Router();
|
|
|
|
router.post(
|
|
'/login/local',
|
|
middleware.logHeaders,
|
|
middleware.loginLimiter,
|
|
middleware.checkBan,
|
|
middleware.requireLocalAuth,
|
|
requireAdmin,
|
|
setBalanceConfig,
|
|
loginController,
|
|
);
|
|
|
|
router.get('/verify', middleware.requireJwtAuth, requireAdmin, (req, res) => {
|
|
const { password: _p, totpSecret: _t, __v, ...user } = req.user;
|
|
user.id = user._id.toString();
|
|
res.status(200).json({ user });
|
|
});
|
|
|
|
router.get('/oauth/openid/check', (req, res) => {
|
|
const openidConfig = getOpenIdConfig();
|
|
if (!openidConfig) {
|
|
return res.status(404).json({
|
|
error: 'OpenID configuration not found',
|
|
error_code: 'OPENID_NOT_CONFIGURED',
|
|
});
|
|
}
|
|
res.status(200).json({ message: 'OpenID check successful' });
|
|
});
|
|
|
|
router.get('/oauth/openid', (req, res, next) => {
|
|
return passport.authenticate('openidAdmin', {
|
|
session: false,
|
|
state: randomState(),
|
|
})(req, res, next);
|
|
});
|
|
|
|
router.get(
|
|
'/oauth/openid/callback',
|
|
passport.authenticate('openidAdmin', {
|
|
failureRedirect: `${getAdminPanelUrl()}/auth/openid/callback?error=auth_failed&error_description=Authentication+failed`,
|
|
failureMessage: true,
|
|
session: false,
|
|
}),
|
|
requireAdmin,
|
|
setBalanceConfig,
|
|
middleware.checkDomainAllowed,
|
|
createOAuthHandler(`${getAdminPanelUrl()}/auth/openid/callback`),
|
|
);
|
|
|
|
/** Regex pattern for valid exchange codes: 64 hex characters */
|
|
const EXCHANGE_CODE_PATTERN = /^[a-f0-9]{64}$/i;
|
|
|
|
/**
|
|
* Exchange OAuth authorization code for tokens.
|
|
* This endpoint is called server-to-server by the admin panel.
|
|
* The code is one-time-use and expires in 30 seconds.
|
|
*
|
|
* POST /api/admin/oauth/exchange
|
|
* Body: { code: string }
|
|
* Response: { token: string, refreshToken: string, user: object }
|
|
*/
|
|
router.post('/oauth/exchange', middleware.loginLimiter, async (req, res) => {
|
|
try {
|
|
const { code } = req.body;
|
|
|
|
if (!code) {
|
|
logger.warn('[admin/oauth/exchange] Missing authorization code');
|
|
return res.status(400).json({
|
|
error: 'Missing authorization code',
|
|
error_code: 'MISSING_CODE',
|
|
});
|
|
}
|
|
|
|
if (typeof code !== 'string' || !EXCHANGE_CODE_PATTERN.test(code)) {
|
|
logger.warn('[admin/oauth/exchange] Invalid authorization code format');
|
|
return res.status(400).json({
|
|
error: 'Invalid authorization code format',
|
|
error_code: 'INVALID_CODE_FORMAT',
|
|
});
|
|
}
|
|
|
|
const cache = getLogStores(CacheKeys.ADMIN_OAUTH_EXCHANGE);
|
|
const result = await exchangeAdminCode(cache, code);
|
|
|
|
if (!result) {
|
|
return res.status(401).json({
|
|
error: 'Invalid or expired authorization code',
|
|
error_code: 'INVALID_OR_EXPIRED_CODE',
|
|
});
|
|
}
|
|
|
|
res.json(result);
|
|
} catch (error) {
|
|
logger.error('[admin/oauth/exchange] Error:', error);
|
|
res.status(500).json({
|
|
error: 'Internal server error',
|
|
error_code: 'INTERNAL_ERROR',
|
|
});
|
|
}
|
|
});
|
|
|
|
module.exports = router;
|