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`.
85 lines
2.6 KiB
JavaScript
85 lines
2.6 KiB
JavaScript
const { logger } = require('@librechat/data-schemas');
|
|
const { ResourceType, PermissionTypes, Permissions } = require('librechat-data-provider');
|
|
const { getRoleByName } = require('~/models');
|
|
|
|
/**
|
|
* Maps resource types to their corresponding permission types
|
|
*/
|
|
const resourceToPermissionType = {
|
|
[ResourceType.AGENT]: PermissionTypes.AGENTS,
|
|
[ResourceType.PROMPTGROUP]: PermissionTypes.PROMPTS,
|
|
[ResourceType.MCPSERVER]: PermissionTypes.MCP_SERVERS,
|
|
[ResourceType.REMOTE_AGENT]: PermissionTypes.REMOTE_AGENTS,
|
|
};
|
|
|
|
/**
|
|
* Middleware to check if user has SHARE_PUBLIC permission for a resource type
|
|
* Only enforced when request body contains `public: true`
|
|
* @param {import('express').Request} req - Express request
|
|
* @param {import('express').Response} res - Express response
|
|
* @param {import('express').NextFunction} next - Express next function
|
|
*/
|
|
const checkSharePublicAccess = async (req, res, next) => {
|
|
try {
|
|
const { public: isPublic } = req.body;
|
|
|
|
// Only check if trying to enable public sharing
|
|
if (!isPublic) {
|
|
return next();
|
|
}
|
|
|
|
const user = req.user;
|
|
if (!user || !user.role) {
|
|
return res.status(401).json({
|
|
error: 'Unauthorized',
|
|
message: 'Authentication required',
|
|
});
|
|
}
|
|
|
|
const { resourceType } = req.params;
|
|
const permissionType = resourceToPermissionType[resourceType];
|
|
|
|
if (!permissionType) {
|
|
return res.status(400).json({
|
|
error: 'Bad Request',
|
|
message: `Unsupported resource type for public sharing: ${resourceType}`,
|
|
});
|
|
}
|
|
|
|
const role = await getRoleByName(user.role);
|
|
if (!role || !role.permissions) {
|
|
return res.status(403).json({
|
|
error: 'Forbidden',
|
|
message: 'No permissions configured for user role',
|
|
});
|
|
}
|
|
|
|
const resourcePerms = role.permissions[permissionType] || {};
|
|
const canSharePublic = resourcePerms[Permissions.SHARE_PUBLIC] === true;
|
|
|
|
if (!canSharePublic) {
|
|
logger.warn(
|
|
`[checkSharePublicAccess][${user.id}] User denied SHARE_PUBLIC for ${resourceType}`,
|
|
);
|
|
return res.status(403).json({
|
|
error: 'Forbidden',
|
|
message: `You do not have permission to share ${resourceType} resources publicly`,
|
|
});
|
|
}
|
|
|
|
next();
|
|
} catch (error) {
|
|
logger.error(
|
|
`[checkSharePublicAccess][${req.user?.id}] Error checking SHARE_PUBLIC permission`,
|
|
error,
|
|
);
|
|
return res.status(500).json({
|
|
error: 'Internal Server Error',
|
|
message: 'Failed to check public sharing permissions',
|
|
});
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
checkSharePublicAccess,
|
|
};
|