mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-19 08:58:09 +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`.
175 lines
5.2 KiB
JavaScript
175 lines
5.2 KiB
JavaScript
const express = require('express');
|
|
const {
|
|
SystemRoles,
|
|
roleDefaults,
|
|
PermissionTypes,
|
|
agentPermissionsSchema,
|
|
promptPermissionsSchema,
|
|
memoryPermissionsSchema,
|
|
mcpServersPermissionsSchema,
|
|
marketplacePermissionsSchema,
|
|
peoplePickerPermissionsSchema,
|
|
remoteAgentsPermissionsSchema,
|
|
} = require('librechat-data-provider');
|
|
const { checkAdmin, requireJwtAuth } = require('~/server/middleware');
|
|
const { updateRoleByName, getRoleByName } = require('~/models');
|
|
|
|
const router = express.Router();
|
|
router.use(requireJwtAuth);
|
|
|
|
/**
|
|
* Permission configuration mapping
|
|
* Maps route paths to their corresponding schemas and permission types
|
|
*/
|
|
const permissionConfigs = {
|
|
prompts: {
|
|
schema: promptPermissionsSchema,
|
|
permissionType: PermissionTypes.PROMPTS,
|
|
errorMessage: 'Invalid prompt permissions.',
|
|
},
|
|
agents: {
|
|
schema: agentPermissionsSchema,
|
|
permissionType: PermissionTypes.AGENTS,
|
|
errorMessage: 'Invalid agent permissions.',
|
|
},
|
|
memories: {
|
|
schema: memoryPermissionsSchema,
|
|
permissionType: PermissionTypes.MEMORIES,
|
|
errorMessage: 'Invalid memory permissions.',
|
|
},
|
|
'people-picker': {
|
|
schema: peoplePickerPermissionsSchema,
|
|
permissionType: PermissionTypes.PEOPLE_PICKER,
|
|
errorMessage: 'Invalid people picker permissions.',
|
|
},
|
|
'mcp-servers': {
|
|
schema: mcpServersPermissionsSchema,
|
|
permissionType: PermissionTypes.MCP_SERVERS,
|
|
errorMessage: 'Invalid MCP servers permissions.',
|
|
},
|
|
marketplace: {
|
|
schema: marketplacePermissionsSchema,
|
|
permissionType: PermissionTypes.MARKETPLACE,
|
|
errorMessage: 'Invalid marketplace permissions.',
|
|
},
|
|
'remote-agents': {
|
|
schema: remoteAgentsPermissionsSchema,
|
|
permissionType: PermissionTypes.REMOTE_AGENTS,
|
|
errorMessage: 'Invalid remote agents permissions.',
|
|
},
|
|
};
|
|
|
|
/**
|
|
* Generic handler for updating permissions
|
|
* @param {string} permissionKey - The key from permissionConfigs
|
|
* @returns {Function} Express route handler
|
|
*/
|
|
const createPermissionUpdateHandler = (permissionKey) => {
|
|
const config = permissionConfigs[permissionKey];
|
|
|
|
return async (req, res) => {
|
|
const { roleName: _r } = req.params;
|
|
// TODO: TEMP, use a better parsing for roleName
|
|
const roleName = _r.toUpperCase();
|
|
const updates = req.body;
|
|
|
|
try {
|
|
const parsedUpdates = config.schema.partial().parse(updates);
|
|
|
|
const role = await getRoleByName(roleName);
|
|
if (!role) {
|
|
return res.status(404).send({ message: 'Role not found' });
|
|
}
|
|
|
|
const currentPermissions =
|
|
role.permissions?.[config.permissionType] || role[config.permissionType] || {};
|
|
|
|
const mergedUpdates = {
|
|
permissions: {
|
|
...role.permissions,
|
|
[config.permissionType]: {
|
|
...currentPermissions,
|
|
...parsedUpdates,
|
|
},
|
|
},
|
|
};
|
|
|
|
const updatedRole = await updateRoleByName(roleName, mergedUpdates);
|
|
res.status(200).send(updatedRole);
|
|
} catch (error) {
|
|
return res.status(400).send({ message: config.errorMessage, error: error.errors });
|
|
}
|
|
};
|
|
};
|
|
|
|
/**
|
|
* GET /api/roles/:roleName
|
|
* Get a specific role by name
|
|
*/
|
|
router.get('/:roleName', async (req, res) => {
|
|
const { roleName: _r } = req.params;
|
|
// TODO: TEMP, use a better parsing for roleName
|
|
const roleName = _r.toUpperCase();
|
|
|
|
if (
|
|
(req.user.role !== SystemRoles.ADMIN && roleName === SystemRoles.ADMIN) ||
|
|
(req.user.role !== SystemRoles.ADMIN && !roleDefaults[roleName])
|
|
) {
|
|
return res.status(403).send({ message: 'Unauthorized' });
|
|
}
|
|
|
|
try {
|
|
const role = await getRoleByName(roleName, '-_id -__v');
|
|
if (!role) {
|
|
return res.status(404).send({ message: 'Role not found' });
|
|
}
|
|
|
|
res.status(200).send(role);
|
|
} catch (error) {
|
|
return res.status(500).send({ message: 'Failed to retrieve role', error: error.message });
|
|
}
|
|
});
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/prompts
|
|
* Update prompt permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/prompts', checkAdmin, createPermissionUpdateHandler('prompts'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/agents
|
|
* Update agent permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/agents', checkAdmin, createPermissionUpdateHandler('agents'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/memories
|
|
* Update memory permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/memories', checkAdmin, createPermissionUpdateHandler('memories'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/people-picker
|
|
* Update people picker permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/people-picker', checkAdmin, createPermissionUpdateHandler('people-picker'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/mcp-servers
|
|
* Update MCP servers permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/mcp-servers', checkAdmin, createPermissionUpdateHandler('mcp-servers'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/marketplace
|
|
* Update marketplace permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/marketplace', checkAdmin, createPermissionUpdateHandler('marketplace'));
|
|
|
|
/**
|
|
* PUT /api/roles/:roleName/remote-agents
|
|
* Update remote agents (API) permissions for a specific role
|
|
*/
|
|
router.put('/:roleName/remote-agents', checkAdmin, createPermissionUpdateHandler('remote-agents'));
|
|
|
|
module.exports = router;
|