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

bugfix: Enhance Agent and AgentCategory schemas with new fields for category, support contact, and promotion status refactored and moved agent category methods and schema to data-schema package 🔧 fix: Merge and Rebase Conflicts - Move AgentCategory from api/models to @packages/data-schemas structure - Add schema, types, methods, and model following codebase conventions - Implement auto-seeding of default categories during AppService startup - Update marketplace controller to use new data-schemas methods - Remove old model file and standalone seed script refactor: unify agent marketplace to single endpoint with cursor pagination - Replace multiple marketplace routes with unified /marketplace endpoint - Add query string controls: category, search, limit, cursor, promoted, requiredPermission - Implement cursor-based pagination replacing page-based system - Integrate ACL permissions for proper access control - Fix ObjectId constructor error in Agent model - Update React components to use unified useGetMarketplaceAgentsQuery hook - Enhance type safety and remove deprecated useDynamicAgentQuery - Update tests for new marketplace architecture -Known issues: see more button after category switching + Unit tests feat: add icon property to ProcessedAgentCategory interface - Add useMarketplaceAgentsInfiniteQuery and useGetAgentCategoriesQuery to client/src/data-provider/Agents/ - Replace manual pagination in AgentGrid with infinite query pattern - Update imports to use local data provider instead of librechat-data-provider - Add proper permission handling with PERMISSION_BITS.VIEW/EDIT constants - Improve agent access control by adding requiredPermission validation in backend - Remove manual cursor/state management in favor of infinite query built-ins - Maintain existing search and category filtering functionality refactor: consolidate agent marketplace endpoints into main agents API and improve data management consistency - Remove dedicated marketplace controller and routes, merging functionality into main agents v1 API - Add countPromotedAgents function to Agent model for promoted agents count - Enhance getListAgents handler with marketplace filtering (category, search, promoted status) - Move getAgentCategories from marketplace to v1 controller with same functionality - Update agent mutations to invalidate marketplace queries and handle multiple permission levels - Improve cache management by updating all agent query variants (VIEW/EDIT permissions) - Consolidate agent data access patterns for better maintainability and consistency - Remove duplicate marketplace route definitions and middleware selected view only agents injected in the drop down fix: remove minlength validation for support contact name in agent schema feat: add validation and error messages for agent name in AgentConfig and AgentPanel fix: update agent permission check logic in AgentPanel to simplify condition Fix linting WIP Fix Unit tests WIP ESLint fixes eslint fix refactor: enhance isDuplicateVersion function in Agent model for improved comparison logic - Introduced handling for undefined/null values in array and object comparisons. - Normalized array comparisons to treat undefined/null as empty arrays. - Added deep comparison for objects and improved handling of primitive values. - Enhanced projectIds comparison to ensure consistent MongoDB ObjectId handling. refactor: remove redundant properties from IAgent interface in agent schema chore: update localization for agent detail component and clean up imports ci: update access middleware tests chore: remove unused PermissionTypes import from Role model ci: update AclEntry model tests ci: update button accessibility labels in AgentDetail tests refactor: update exhaustive dep. lint warning 🔧 fix: Fixed agent actions access feat: Add role-level permissions for agent sharing people picker - Add PEOPLE_PICKER permission type with VIEW_USERS and VIEW_GROUPS permissions - Create custom middleware for query-aware permission validation - Implement permission-based type filtering in PeoplePicker component - Hide people picker UI when user lacks permissions, show only public toggle - Support granular access: users-only, groups-only, or mixed search modes refactor: Replace marketplace interface config with permission-based system - Add MARKETPLACE permission type to handle marketplace access control - Update interface configuration to use role-based marketplace settings (admin/user) - Replace direct marketplace boolean config with permission-based checks - Modify frontend components to use marketplace permissions instead of interface config - Update agent query hooks to use marketplace permissions for determining permission levels - Add marketplace configuration structure similar to peoplePicker in YAML config - Backend now sets MARKETPLACE permissions based on interface configuration - When marketplace enabled: users get agents with EDIT permissions in dropdown lists (builder mode) - When marketplace disabled: users get agents with VIEW permissions in dropdown lists (browse mode) 🔧 fix: Redirect to New Chat if No Marketplace Access and Required Agent Name Placeholder (#8213) * Fix: Fix the redirect to new chat page if access to marketplace is denied * Fixed the required agent name placeholder --------- Co-authored-by: Atef Bellaaj <slalom.bellaaj@external.daimlertruck.com> chore: fix tests, remove unnecessary imports refactor: Implement permission checks for file access via agents - Updated `hasAccessToFilesViaAgent` to utilize permission checks for VIEW and EDIT access. - Replaced project-based access validation with permission-based checks. - Enhanced tests to cover new permission logic and ensure proper access control for files associated with agents. - Cleaned up imports and initialized models in test files for consistency. refactor: Enhance test setup and cleanup for file access control - Introduced modelsToCleanup array to track models added during tests for proper cleanup. - Updated afterAll hooks in test files to ensure all collections are cleared and only added models are deleted. - Improved consistency in model initialization across test files. - Added comments for clarity on cleanup processes and test data management. chore: Update Jest configuration and test setup for improved timeout handling - Added a global test timeout of 30 seconds in jest.config.js. - Configured jest.setTimeout in jestSetup.js to allow individual test overrides if needed. - Enhanced test reliability by ensuring consistent timeout settings across all tests. refactor: Implement file access filtering based on agent permissions - Introduced `filterFilesByAgentAccess` function to filter files based on user access through agents. - Updated `getFiles` and `primeFiles` functions to utilize the new filtering logic. - Moved `hasAccessToFilesViaAgent` function from the File model to permission services, adjusting imports accordingly - Enhanced tests to ensure proper access control and filtering behavior for files associated with agents. fix: make support_contact field a nested object rather than a sub-document refactor: Update support_contact field initialization in agent model - Removed handling for empty support_contact object in createAgent function. - Changed default value of support_contact in agent schema to undefined. test: Add comprehensive tests for support_contact field handling and versioning refactor: remove unused avatar upload mutation field and add informational toast for success chore: add missing SidePanelProvider for AgentMarketplace and organize imports fix: resolve agent selection race condition in marketplace HandleStartChat - Set agent in localStorage before newConversation to prevent useSelectorEffects from auto-selecting previous agent fix: resolve agent dropdown showing raw ID instead of agent info from URL - Add proactive agent fetching when agent_id is present in URL parameters - Inject fetched agent into agents cache so dropdowns display proper name/avatar - Use useAgentsMap dependency to ensure proper cache initialization timing - Prevents raw agent IDs from showing in UI when visiting shared agent links Fix: Agents endpoint renamed to "My Agent" for less confusion with the Marketplace agents. chore: fix ESLint issues and Test Mocks ci: update permissions structure in loadDefaultInterface tests - Refactored permissions for MEMORY and added new permissions for MARKETPLACE and PEOPLE_PICKER. - Ensured consistent structure for permissions across different types. feat: support_contact validation to allow empty email strings
256 lines
8 KiB
JavaScript
256 lines
8 KiB
JavaScript
const {
|
|
CacheKeys,
|
|
SystemRoles,
|
|
roleDefaults,
|
|
permissionsSchema,
|
|
removeNullishValues,
|
|
} = require('librechat-data-provider');
|
|
const { logger } = require('@librechat/data-schemas');
|
|
const getLogStores = require('~/cache/getLogStores');
|
|
const { Role } = require('~/db/models');
|
|
|
|
/**
|
|
* Retrieve a role by name and convert the found role document to a plain object.
|
|
* If the role with the given name doesn't exist and the name is a system defined role,
|
|
* create it and return the lean version.
|
|
*
|
|
* @param {string} roleName - The name of the role to find or create.
|
|
* @param {string|string[]} [fieldsToSelect] - The fields to include or exclude in the returned document.
|
|
* @returns {Promise<Object>} A plain object representing the role document.
|
|
*/
|
|
const getRoleByName = async function (roleName, fieldsToSelect = null) {
|
|
const cache = getLogStores(CacheKeys.ROLES);
|
|
try {
|
|
const cachedRole = await cache.get(roleName);
|
|
if (cachedRole) {
|
|
return cachedRole;
|
|
}
|
|
let query = Role.findOne({ name: roleName });
|
|
if (fieldsToSelect) {
|
|
query = query.select(fieldsToSelect);
|
|
}
|
|
let role = await query.lean().exec();
|
|
|
|
if (!role && SystemRoles[roleName]) {
|
|
role = await new Role(roleDefaults[roleName]).save();
|
|
await cache.set(roleName, role);
|
|
return role.toObject();
|
|
}
|
|
await cache.set(roleName, role);
|
|
return role;
|
|
} catch (error) {
|
|
throw new Error(`Failed to retrieve or create role: ${error.message}`);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Update role values by name.
|
|
*
|
|
* @param {string} roleName - The name of the role to update.
|
|
* @param {Partial<TRole>} updates - The fields to update.
|
|
* @returns {Promise<TRole>} Updated role document.
|
|
*/
|
|
const updateRoleByName = async function (roleName, updates) {
|
|
const cache = getLogStores(CacheKeys.ROLES);
|
|
try {
|
|
const role = await Role.findOneAndUpdate(
|
|
{ name: roleName },
|
|
{ $set: updates },
|
|
{ new: true, lean: true },
|
|
)
|
|
.select('-__v')
|
|
.lean()
|
|
.exec();
|
|
await cache.set(roleName, role);
|
|
return role;
|
|
} catch (error) {
|
|
throw new Error(`Failed to update role: ${error.message}`);
|
|
}
|
|
};
|
|
|
|
/**
|
|
* Updates access permissions for a specific role and multiple permission types.
|
|
* @param {string} roleName - The role to update.
|
|
* @param {Object.<PermissionTypes, Object.<Permissions, boolean>>} permissionsUpdate - Permissions to update and their values.
|
|
*/
|
|
async function updateAccessPermissions(roleName, permissionsUpdate) {
|
|
// Filter and clean the permission updates based on our schema definition.
|
|
const updates = {};
|
|
for (const [permissionType, permissions] of Object.entries(permissionsUpdate)) {
|
|
if (permissionsSchema.shape && permissionsSchema.shape[permissionType]) {
|
|
updates[permissionType] = removeNullishValues(permissions);
|
|
}
|
|
}
|
|
if (!Object.keys(updates).length) {
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const role = await getRoleByName(roleName);
|
|
if (!role) {
|
|
return;
|
|
}
|
|
|
|
const currentPermissions = role.permissions || {};
|
|
const updatedPermissions = { ...currentPermissions };
|
|
let hasChanges = false;
|
|
|
|
const unsetFields = {};
|
|
const permissionTypes = Object.keys(permissionsSchema.shape || {});
|
|
for (const permType of permissionTypes) {
|
|
if (role[permType] && typeof role[permType] === 'object') {
|
|
logger.info(
|
|
`Migrating '${roleName}' role from old schema: found '${permType}' at top level`,
|
|
);
|
|
|
|
updatedPermissions[permType] = {
|
|
...updatedPermissions[permType],
|
|
...role[permType],
|
|
};
|
|
|
|
unsetFields[permType] = 1;
|
|
hasChanges = true;
|
|
}
|
|
}
|
|
|
|
// Process the current updates
|
|
for (const [permissionType, permissions] of Object.entries(updates)) {
|
|
const currentTypePermissions = currentPermissions[permissionType] || {};
|
|
updatedPermissions[permissionType] = { ...currentTypePermissions };
|
|
|
|
for (const [permission, value] of Object.entries(permissions)) {
|
|
if (currentTypePermissions[permission] !== value) {
|
|
updatedPermissions[permissionType][permission] = value;
|
|
hasChanges = true;
|
|
logger.info(
|
|
`Updating '${roleName}' role permission '${permissionType}' '${permission}' from ${currentTypePermissions[permission]} to: ${value}`,
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
if (hasChanges) {
|
|
const updateObj = { permissions: updatedPermissions };
|
|
|
|
if (Object.keys(unsetFields).length > 0) {
|
|
logger.info(
|
|
`Unsetting old schema fields for '${roleName}' role: ${Object.keys(unsetFields).join(', ')}`,
|
|
);
|
|
|
|
try {
|
|
await Role.updateOne(
|
|
{ name: roleName },
|
|
{
|
|
$set: updateObj,
|
|
$unset: unsetFields,
|
|
},
|
|
);
|
|
|
|
const cache = getLogStores(CacheKeys.ROLES);
|
|
const updatedRole = await Role.findOne({ name: roleName }).select('-__v').lean().exec();
|
|
await cache.set(roleName, updatedRole);
|
|
|
|
logger.info(`Updated role '${roleName}' and removed old schema fields`);
|
|
} catch (updateError) {
|
|
logger.error(`Error during role migration update: ${updateError.message}`);
|
|
throw updateError;
|
|
}
|
|
} else {
|
|
// Standard update if no migration needed
|
|
await updateRoleByName(roleName, updateObj);
|
|
}
|
|
|
|
logger.info(`Updated '${roleName}' role permissions`);
|
|
} else {
|
|
logger.info(`No changes needed for '${roleName}' role permissions`);
|
|
}
|
|
} catch (error) {
|
|
logger.error(`Failed to update ${roleName} role permissions:`, error);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Migrates roles from old schema to new schema structure.
|
|
* This can be called directly to fix existing roles.
|
|
*
|
|
* @param {string} [roleName] - Optional specific role to migrate. If not provided, migrates all roles.
|
|
* @returns {Promise<number>} Number of roles migrated.
|
|
*/
|
|
const migrateRoleSchema = async function (roleName) {
|
|
try {
|
|
// Get roles to migrate
|
|
let roles;
|
|
if (roleName) {
|
|
const role = await Role.findOne({ name: roleName });
|
|
roles = role ? [role] : [];
|
|
} else {
|
|
roles = await Role.find({});
|
|
}
|
|
|
|
logger.info(`Migrating ${roles.length} roles to new schema structure`);
|
|
let migratedCount = 0;
|
|
|
|
for (const role of roles) {
|
|
const permissionTypes = Object.keys(permissionsSchema.shape || {});
|
|
const unsetFields = {};
|
|
let hasOldSchema = false;
|
|
|
|
// Check for old schema fields
|
|
for (const permType of permissionTypes) {
|
|
if (role[permType] && typeof role[permType] === 'object') {
|
|
hasOldSchema = true;
|
|
|
|
// Ensure permissions object exists
|
|
role.permissions = role.permissions || {};
|
|
|
|
// Migrate permissions from old location to new
|
|
role.permissions[permType] = {
|
|
...role.permissions[permType],
|
|
...role[permType],
|
|
};
|
|
|
|
// Mark field for removal
|
|
unsetFields[permType] = 1;
|
|
}
|
|
}
|
|
|
|
if (hasOldSchema) {
|
|
try {
|
|
logger.info(`Migrating role '${role.name}' from old schema structure`);
|
|
|
|
// Simple update operation
|
|
await Role.updateOne(
|
|
{ _id: role._id },
|
|
{
|
|
$set: { permissions: role.permissions },
|
|
$unset: unsetFields,
|
|
},
|
|
);
|
|
|
|
// Refresh cache
|
|
const cache = getLogStores(CacheKeys.ROLES);
|
|
const updatedRole = await Role.findById(role._id).lean().exec();
|
|
await cache.set(role.name, updatedRole);
|
|
|
|
migratedCount++;
|
|
logger.info(`Migrated role '${role.name}'`);
|
|
} catch (error) {
|
|
logger.error(`Failed to migrate role '${role.name}': ${error.message}`);
|
|
}
|
|
}
|
|
}
|
|
|
|
logger.info(`Migration complete: ${migratedCount} roles migrated`);
|
|
return migratedCount;
|
|
} catch (error) {
|
|
logger.error(`Role schema migration failed: ${error.message}`);
|
|
throw error;
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
getRoleByName,
|
|
updateRoleByName,
|
|
migrateRoleSchema,
|
|
updateAccessPermissions,
|
|
};
|