Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2026-03-25 00:56:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

🧹 chore: Move direct model usage from PermissionsController to data-schemas
Some checks are pending
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Waiting to run
Details
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Waiting to run
Details

Browse source
This commit is contained in:
Danny Avila 2026-03-21 15:20:15 -04:00
parent a78865b5e0
commit 04e65bb21a
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
3 changed files with 47 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

52
api/server/controllers/__tests__/PermissionsController.spec.js
View file

@ -29,10 +29,13 @@ jest.mock('~/server/services/PermissionService', () => ({
getResourcePermissionsMap: jest.fn(),
}));
const mockRemoveAgentFromUserFavorites = jest.fn();
jest.mock('~/models', () => ({
searchPrincipals: jest.fn(),
sortPrincipalsByRelevance: jest.fn(),
calculateRelevanceScore: jest.fn(),
removeAgentFromUserFavorites: (...args) => mockRemoveAgentFromUserFavorites(...args),
}));
jest.mock('~/server/services/GraphApiService', () => ({
@ -40,20 +43,6 @@ jest.mock('~/server/services/GraphApiService', () => ({
searchEntraIdPrincipals: jest.fn(),
}));
const mockAgentFindOne = jest.fn();
const mockUserUpdateMany = jest.fn();
jest.mock('~/db/models', () => ({
Agent: {
findOne: (...args) => mockAgentFindOne(...args),
},
AclEntry: {},
AccessRole: {},
User: {
updateMany: (...args) => mockUserUpdateMany(...args),
},
}));
const { updateResourcePermissions } = require('../PermissionsController');
const createMockReq = (overrides = {}) => ({
@ -90,10 +79,7 @@ describe('PermissionsController', () => {
errors: [],
});
mockAgentFindOne.mockReturnValue({
lean: () => Promise.resolve({ _id: agentObjectId, id: 'agent_abc123' }),
});
mockUserUpdateMany.mockResolvedValue({ modifiedCount: 1 });
mockRemoveAgentFromUserFavorites.mockResolvedValue(undefined);
});
it('removes agent from revoked users favorites on AGENT resource type', async () => {
@ -111,11 +97,7 @@ describe('PermissionsController', () => {
await flushPromises();
expect(res.status).toHaveBeenCalledWith(200);
expect(mockAgentFindOne).toHaveBeenCalledWith({ _id: agentObjectId }, { id: 1 });
expect(mockUserUpdateMany).toHaveBeenCalledWith(
{ _id: { $in: [revokedUserId] }, 'favorites.agentId': 'agent_abc123' },
{ $pull: { favorites: { agentId: 'agent_abc123' } } },
);
expect(mockRemoveAgentFromUserFavorites).toHaveBeenCalledWith(agentObjectId, [revokedUserId]);
});
it('removes agent from revoked users favorites on REMOTE_AGENT resource type', async () => {
@ -132,8 +114,7 @@ describe('PermissionsController', () => {
await updateResourcePermissions(req, res);
await flushPromises();
expect(mockAgentFindOne).toHaveBeenCalledWith({ _id: agentObjectId }, { id: 1 });
expect(mockUserUpdateMany).toHaveBeenCalled();
expect(mockRemoveAgentFromUserFavorites).toHaveBeenCalledWith(agentObjectId, [revokedUserId]);
});
it('uses results.revoked (validated) not raw request payload', async () => {
@ -163,10 +144,7 @@ describe('PermissionsController', () => {
await updateResourcePermissions(req, res);
await flushPromises();
expect(mockUserUpdateMany).toHaveBeenCalledWith(
expect.objectContaining({ _id: { $in: [validId] } }),
expect.any(Object),
);
expect(mockRemoveAgentFromUserFavorites).toHaveBeenCalledWith(agentObjectId, [validId]);
});
it('skips cleanup when no USER principals are revoked', async () => {
@ -190,8 +168,7 @@ describe('PermissionsController', () => {
await updateResourcePermissions(req, res);
await flushPromises();
expect(mockAgentFindOne).not.toHaveBeenCalled();
expect(mockUserUpdateMany).not.toHaveBeenCalled();
expect(mockRemoveAgentFromUserFavorites).not.toHaveBeenCalled();
});
it('skips cleanup for non-agent resource types', async () => {
@ -216,13 +193,11 @@ describe('PermissionsController', () => {
await flushPromises();
expect(res.status).toHaveBeenCalledWith(200);
expect(mockAgentFindOne).not.toHaveBeenCalled();
expect(mockRemoveAgentFromUserFavorites).not.toHaveBeenCalled();
});
it('handles agent not found gracefully', async () => {
mockAgentFindOne.mockReturnValue({
lean: () => Promise.resolve(null),
});
mockRemoveAgentFromUserFavorites.mockResolvedValue(undefined);
const req = createMockReq({
params: { resourceType: ResourceType.AGENT, resourceId: agentObjectId },
@ -237,13 +212,12 @@ describe('PermissionsController', () => {
await updateResourcePermissions(req, res);
await flushPromises();
expect(mockAgentFindOne).toHaveBeenCalled();
expect(mockUserUpdateMany).not.toHaveBeenCalled();
expect(mockRemoveAgentFromUserFavorites).toHaveBeenCalled();
expect(res.status).toHaveBeenCalledWith(200);
});
it('logs error when User.updateMany fails without blocking response', async () => {
mockUserUpdateMany.mockRejectedValue(new Error('DB connection lost'));
it('logs error when removeAgentFromUserFavorites fails without blocking response', async () => {
mockRemoveAgentFromUserFavorites.mockRejectedValue(new Error('DB connection lost'));
const req = createMockReq({
params: { resourceType: ResourceType.AGENT, resourceId: agentObjectId },