🔧 refactor: Organize Sharing/Agent Components and Improve Type Safety

refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids, rename enums to PascalCase

refactor: organize Sharing/Agent components, improve type safety for resource types and access role ids

chore: move sharing related components to dedicated "Sharing" directory

chore: remove PublicSharingToggle component and update index exports

chore: move non-sidepanel agent components to `~/components/Agents`

chore: move AgentCategoryDisplay component with tests

chore: remove commented out code

refactor: change PERMISSION_BITS from const to enum for better type safety

refactor: reorganize imports in GenericGrantAccessDialog and update index exports for hooks

refactor: update type definitions to use ACCESS_ROLE_IDS for improved type safety

refactor: remove unused canAccessPromptResource middleware and related code

refactor: remove unused prompt access roles from createAccessRoleMethods

refactor: update resourceType in AclEntry type definition to remove unused 'prompt' value

refactor: introduce ResourceType enum and update resourceType usage across data provider files for improved type safety

refactor: update resourceType usage to ResourceType enum across sharing and permissions components for improved type safety

refactor: standardize resourceType usage to ResourceType enum across agent and prompt models, permissions controller, and middleware for enhanced type safety

refactor: update resourceType references from PROMPT_GROUP to PROMPTGROUP for consistency across models, middleware, and components

refactor: standardize access role IDs and resource type usage across agent, file, and prompt models for improved type safety and consistency

chore: add typedefs for TUpdateResourcePermissionsRequest and TUpdateResourcePermissionsResponse to enhance type definitions

chore: move SearchPicker to PeoplePicker dir

refactor: implement debouncing for query changes in SearchPicker for improved performance

chore: fix typing, import order for agent admin settings

fix: agent admin settings, prevent agent form submission

refactor: rename `ACCESS_ROLE_IDS` to `AccessRoleIds`

refactor: replace PermissionBits with PERMISSION_BITS

refactor: replace PERMISSION_BITS with PermissionBits

api/server/middleware/accessResources/canAccessAgentFromBody.js

@@ -1,5 +1,5 @@
 const { logger } = require('@librechat/data-schemas');
-const { Constants, isAgentsEndpoint } = require('librechat-data-provider');
+const { Constants, isAgentsEndpoint, ResourceType } = require('librechat-data-provider');
 const { canAccessResource } = require('./canAccessResource');
 const { getAgent } = require('~/models/Agent');
 
@@ -67,7 +67,7 @@ const canAccessAgentFromBody = (options) => {
       }
 
       const agentAccessMiddleware = canAccessResource({
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         requiredPermission,
         resourceIdParam: 'agent_id', // This will be ignored since we use custom resolver
         idResolver: () => resolveAgentIdFromBody(agentId),

api/server/middleware/accessResources/canAccessAgentResource.js

@@ -1,5 +1,6 @@
-const { getAgent } = require('~/models/Agent');
+const { ResourceType } = require('librechat-data-provider');
 const { canAccessResource } = require('./canAccessResource');
+const { getAgent } = require('~/models/Agent');
 
 /**
  * Agent ID resolver function
@@ -46,7 +47,7 @@ const canAccessAgentResource = (options) => {
   }
 
   return canAccessResource({
-    resourceType: 'agent',
+    resourceType: ResourceType.AGENT,
     requiredPermission,
     resourceIdParam,
     idResolver: resolveAgentId,

api/server/middleware/accessResources/canAccessAgentResource.spec.js

@@ -1,4 +1,5 @@
 const mongoose = require('mongoose');
+const { ResourceType } = require('librechat-data-provider');
 const { MongoMemoryServer } = require('mongodb-memory-server');
 const { canAccessAgentResource } = require('./canAccessAgentResource');
 const { User, Role, AclEntry } = require('~/db/models');
@@ -99,7 +100,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: testUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 15, // All permissions (1+2+4+8)
         grantedBy: testUser._id,
@@ -136,7 +137,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: otherUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 15, // All permissions
         grantedBy: otherUser._id,
@@ -177,7 +178,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: testUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 1, // VIEW permission
         grantedBy: otherUser._id,
@@ -214,7 +215,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: testUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 1, // VIEW permission only
         grantedBy: otherUser._id,
@@ -261,7 +262,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: testUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 15, // All permissions
         grantedBy: testUser._id,
@@ -297,7 +298,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: testUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 15, // All permissions (1+2+4+8)
         grantedBy: testUser._id,
@@ -357,7 +358,7 @@ describe('canAccessAgentResource middleware', () => {
         principalType: 'user',
         principalId: testUser._id,
         principalModel: 'User',
-        resourceType: 'agent',
+        resourceType: ResourceType.AGENT,
         resourceId: agent._id,
         permBits: 15, // All permissions
         grantedBy: testUser._id,

api/server/middleware/accessResources/canAccessPromptGroupResource.js

@@ -1,5 +1,6 @@
-const { getPromptGroup } = require('~/models/Prompt');
+const { ResourceType } = require('librechat-data-provider');
 const { canAccessResource } = require('./canAccessResource');
+const { getPromptGroup } = require('~/models/Prompt');
 
 /**
  * PromptGroup ID resolver function
@@ -48,7 +49,7 @@ const canAccessPromptGroupResource = (options) => {
   }
 
   return canAccessResource({
-    resourceType: 'promptGroup',
+    resourceType: ResourceType.PROMPTGROUP,
     requiredPermission,
     resourceIdParam,
     idResolver: resolvePromptGroupId,

api/server/middleware/accessResources/canAccessPromptResource.js

@@ -1,58 +0,0 @@
-const { getPrompt } = require('~/models/Prompt');
-const { canAccessResource } = require('./canAccessResource');
-
-/**
- * Prompt ID resolver function
- * Resolves prompt ID to MongoDB ObjectId
- *
- * @param {string} promptId - Prompt ID from route parameter
- * @returns {Promise<Object|null>} Prompt document with _id field, or null if not found
- */
-const resolvePromptId = async (promptId) => {
-  return await getPrompt({ _id: promptId });
-};
-
-/**
- * Prompt-specific middleware factory that creates middleware to check prompt access permissions.
- * This middleware extends the generic canAccessResource to handle prompt ID resolution.
- *
- * @param {Object} options - Configuration options
- * @param {number} options.requiredPermission - The permission bit required (1=view, 2=edit, 4=delete, 8=share)
- * @param {string} [options.resourceIdParam='promptId'] - The name of the route parameter containing the prompt ID
- * @returns {Function} Express middleware function
- *
- * @example
- * // Basic usage for viewing prompts
- * router.get('/prompts/:promptId',
- *   canAccessPromptResource({ requiredPermission: 1 }),
- *   getPrompt
- * );
- *
- * @example
- * // Custom resource ID parameter and edit permission
- * router.patch('/prompts/:id',
- *   canAccessPromptResource({
- *     requiredPermission: 2,
- *     resourceIdParam: 'id'
- *   }),
- *   updatePrompt
- * );
- */
-const canAccessPromptResource = (options) => {
-  const { requiredPermission, resourceIdParam = 'promptId' } = options;
-
-  if (!requiredPermission || typeof requiredPermission !== 'number') {
-    throw new Error('canAccessPromptResource: requiredPermission is required and must be a number');
-  }
-
-  return canAccessResource({
-    resourceType: 'prompt',
-    requiredPermission,
-    resourceIdParam,
-    idResolver: resolvePromptId,
-  });
-};
-
-module.exports = {
-  canAccessPromptResource,
-};

api/server/middleware/accessResources/canAccessPromptViaGroup.js

@@ -1,5 +1,6 @@
-const { getPrompt } = require('~/models/Prompt');
+const { ResourceType } = require('librechat-data-provider');
 const { canAccessResource } = require('./canAccessResource');
+const { getPrompt } = require('~/models/Prompt');
 
 /**
  * Prompt to PromptGroup ID resolver function
@@ -42,7 +43,7 @@ const canAccessPromptViaGroup = (options) => {
   }
 
   return canAccessResource({
-    resourceType: 'promptGroup',
+    resourceType: ResourceType.PROMPTGROUP,
     requiredPermission,
     resourceIdParam,
     idResolver: resolvePromptToGroupId,

api/server/middleware/accessResources/fileAccess.js

@@ -1,8 +1,8 @@
 const { logger } = require('@librechat/data-schemas');
-const { PERMISSION_BITS, hasPermissions } = require('librechat-data-provider');
+const { PermissionBits, hasPermissions, ResourceType } = require('librechat-data-provider');
 const { getEffectivePermissions } = require('~/server/services/PermissionService');
-const { getFiles } = require('~/models/File');
 const { getAgent } = require('~/models/Agent');
+const { getFiles } = require('~/models/File');
 
 /**
  * Checks if user has access to a file through agent permissions
@@ -35,11 +35,11 @@ const checkAgentBasedFileAccess = async (userId, fileId) => {
       try {
         const permissions = await getEffectivePermissions({
           userId,
-          resourceType: 'agent',
+          resourceType: ResourceType.AGENT,
           resourceId: agent._id || agent.id,
         });
 
-        if (hasPermissions(permissions, PERMISSION_BITS.VIEW)) {
+        if (hasPermissions(permissions, PermissionBits.VIEW)) {
           logger.debug(`[fileAccess] User ${userId} has VIEW permissions on agent ${agent.id}`);
           return true;
         }

api/server/middleware/accessResources/index.js

@@ -1,7 +1,6 @@
 const { canAccessResource } = require('./canAccessResource');
 const { canAccessAgentResource } = require('./canAccessAgentResource');
 const { canAccessAgentFromBody } = require('./canAccessAgentFromBody');
-const { canAccessPromptResource } = require('./canAccessPromptResource');
 const { canAccessPromptViaGroup } = require('./canAccessPromptViaGroup');
 const { canAccessPromptGroupResource } = require('./canAccessPromptGroupResource');
 
@@ -9,7 +8,6 @@ module.exports = {
   canAccessResource,
   canAccessAgentResource,
   canAccessAgentFromBody,
-  canAccessPromptResource,
   canAccessPromptViaGroup,
   canAccessPromptGroupResource,
 };