🐘 feat: FerretDB Compatibility (#11769)
* feat: replace unsupported MongoDB aggregation operators for FerretDB compatibility
Replace $lookup, $unwind, $sample, $replaceRoot, and $addFields aggregation
stages which are unsupported on FerretDB v2.x (postgres-documentdb backend).
- Prompt.js: Replace $lookup/$unwind/$project pipelines with find().select().lean()
+ attachProductionPrompts() batch helper. Replace $group/$replaceRoot/$sample
in getRandomPromptGroups with distinct() + Fisher-Yates shuffle.
- Agent/Prompt migration scripts: Replace $lookup anti-join pattern with
distinct() + $nin two-step queries for finding un-migrated resources.
All replacement patterns verified against FerretDB v2.7.0.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: use $pullAll for simple array removals, fix memberIds type mismatches
Replace $pull with $pullAll for exact-value scalar array removals. Both
operators work on MongoDB and FerretDB, but $pullAll is more explicit for
exact matching (no condition expressions).
Fix critical type mismatch bugs where ObjectId values were used against
String[] memberIds arrays in Group queries:
- config/delete-user.js: use string uid instead of ObjectId user._id
- e2e/setup/cleanupUser.ts: convert userId.toString() before query
Harden PermissionService.bulkUpdateResourcePermissions abort handling to
prevent crash when abortTransaction is called after commitTransaction.
All changes verified against FerretDB v2.7.0 and MongoDB Memory Server.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: harden transaction support probe for FerretDB compatibility
Commit the transaction before aborting in supportsTransactions probe, and
wrap abortTransaction in try-catch to prevent crashes when abort is called
after a successful commit (observed behavior on FerretDB).
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: add FerretDB compatibility test suite, retry utilities, and CI config
Add comprehensive FerretDB integration test suite covering:
- $pullAll scalar array operations
- $pull with subdocument conditions
- $lookup replacement (find + manual join)
- $sample replacement (distinct + Fisher-Yates)
- $bit and $bitsAllSet operations
- Migration anti-join pattern
- Multi-tenancy (useDb, scaling, write amplification)
- Sharding proof-of-concept
- Production operations (backup/restore, schema migration, deadlock retry)
Add production retryWithBackoff utility for deadlock recovery during
concurrent index creation on FerretDB/DocumentDB backends.
Add UserController.spec.js tests for deleteUserController (runs in CI).
Configure jest and eslint to isolate FerretDB tests from CI pipelines:
- packages/data-schemas/jest.config.mjs: ignore misc/ directory
- eslint.config.mjs: ignore packages/data-schemas/misc/
Include Docker Compose config for local FerretDB v2.7 + postgres-documentdb,
dedicated jest/tsconfig for the test files, and multi-tenancy findings doc.
Co-authored-by: Cursor <cursoragent@cursor.com>
* style: brace formatting in aclEntry.ts modifyPermissionBits
Co-authored-by: Cursor <cursoragent@cursor.com>
* refactor: reorganize retry utilities and update imports
- Moved retryWithBackoff utility to a new file `retry.ts` for better structure.
- Updated imports in `orgOperations.ferretdb.spec.ts` to reflect the new location of retry utilities.
- Removed old import statement for retryWithBackoff from index.ts to streamline exports.
* test: add $pullAll coverage for ConversationTag and PermissionService
Add integration tests for deleteConversationTag verifying $pullAll
removes tags from conversations correctly, and for
syncUserEntraGroupMemberships verifying $pullAll removes user from
non-matching Entra groups while preserving local group membership.
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-13 02:14:34 -05:00
|
|
|
const mongoose = require('mongoose');
|
|
|
|
|
const { MongoMemoryServer } = require('mongodb-memory-server');
|
|
|
|
|
|
|
|
|
|
jest.mock('@librechat/data-schemas', () => {
|
|
|
|
|
const actual = jest.requireActual('@librechat/data-schemas');
|
|
|
|
|
return {
|
|
|
|
|
...actual,
|
|
|
|
|
logger: {
|
|
|
|
|
debug: jest.fn(),
|
|
|
|
|
error: jest.fn(),
|
|
|
|
|
warn: jest.fn(),
|
|
|
|
|
info: jest.fn(),
|
|
|
|
|
},
|
|
|
|
|
};
|
|
|
|
|
});
|
|
|
|
|
|
📦 refactor: Consolidate DB models, encapsulating Mongoose usage in `data-schemas` (#11830)
* 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`.
2026-02-17 18:23:44 -05:00
|
|
|
jest.mock('~/models', () => {
|
|
|
|
|
const _mongoose = require('mongoose');
|
|
|
|
|
return {
|
|
|
|
|
deleteAllUserSessions: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteAllSharedLinks: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteAllAgentApiKeys: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteConversationTags: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteAllUserMemories: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteTransactions: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteAclEntries: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
updateUserPlugins: jest.fn(),
|
|
|
|
|
deleteAssistants: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteUserById: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteUserPrompts: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteMessages: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteBalances: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteActions: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deletePresets: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteUserKey: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteToolCalls: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteUserAgents: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteTokens: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteConvos: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
deleteFiles: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
updateUser: jest.fn(),
|
|
|
|
|
getUserById: jest.fn().mockResolvedValue(null),
|
|
|
|
|
findToken: jest.fn(),
|
|
|
|
|
getFiles: jest.fn().mockResolvedValue([]),
|
|
|
|
|
removeUserFromAllGroups: jest.fn().mockImplementation(async (userId) => {
|
|
|
|
|
const Group = _mongoose.models.Group;
|
|
|
|
|
await Group.updateMany({ memberIds: userId }, { $pullAll: { memberIds: [userId] } });
|
|
|
|
|
}),
|
|
|
|
|
};
|
|
|
|
|
});
|
🐘 feat: FerretDB Compatibility (#11769)
* feat: replace unsupported MongoDB aggregation operators for FerretDB compatibility
Replace $lookup, $unwind, $sample, $replaceRoot, and $addFields aggregation
stages which are unsupported on FerretDB v2.x (postgres-documentdb backend).
- Prompt.js: Replace $lookup/$unwind/$project pipelines with find().select().lean()
+ attachProductionPrompts() batch helper. Replace $group/$replaceRoot/$sample
in getRandomPromptGroups with distinct() + Fisher-Yates shuffle.
- Agent/Prompt migration scripts: Replace $lookup anti-join pattern with
distinct() + $nin two-step queries for finding un-migrated resources.
All replacement patterns verified against FerretDB v2.7.0.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: use $pullAll for simple array removals, fix memberIds type mismatches
Replace $pull with $pullAll for exact-value scalar array removals. Both
operators work on MongoDB and FerretDB, but $pullAll is more explicit for
exact matching (no condition expressions).
Fix critical type mismatch bugs where ObjectId values were used against
String[] memberIds arrays in Group queries:
- config/delete-user.js: use string uid instead of ObjectId user._id
- e2e/setup/cleanupUser.ts: convert userId.toString() before query
Harden PermissionService.bulkUpdateResourcePermissions abort handling to
prevent crash when abortTransaction is called after commitTransaction.
All changes verified against FerretDB v2.7.0 and MongoDB Memory Server.
Co-authored-by: Cursor <cursoragent@cursor.com>
* fix: harden transaction support probe for FerretDB compatibility
Commit the transaction before aborting in supportsTransactions probe, and
wrap abortTransaction in try-catch to prevent crashes when abort is called
after a successful commit (observed behavior on FerretDB).
Co-authored-by: Cursor <cursoragent@cursor.com>
* feat: add FerretDB compatibility test suite, retry utilities, and CI config
Add comprehensive FerretDB integration test suite covering:
- $pullAll scalar array operations
- $pull with subdocument conditions
- $lookup replacement (find + manual join)
- $sample replacement (distinct + Fisher-Yates)
- $bit and $bitsAllSet operations
- Migration anti-join pattern
- Multi-tenancy (useDb, scaling, write amplification)
- Sharding proof-of-concept
- Production operations (backup/restore, schema migration, deadlock retry)
Add production retryWithBackoff utility for deadlock recovery during
concurrent index creation on FerretDB/DocumentDB backends.
Add UserController.spec.js tests for deleteUserController (runs in CI).
Configure jest and eslint to isolate FerretDB tests from CI pipelines:
- packages/data-schemas/jest.config.mjs: ignore misc/ directory
- eslint.config.mjs: ignore packages/data-schemas/misc/
Include Docker Compose config for local FerretDB v2.7 + postgres-documentdb,
dedicated jest/tsconfig for the test files, and multi-tenancy findings doc.
Co-authored-by: Cursor <cursoragent@cursor.com>
* style: brace formatting in aclEntry.ts modifyPermissionBits
Co-authored-by: Cursor <cursoragent@cursor.com>
* refactor: reorganize retry utilities and update imports
- Moved retryWithBackoff utility to a new file `retry.ts` for better structure.
- Updated imports in `orgOperations.ferretdb.spec.ts` to reflect the new location of retry utilities.
- Removed old import statement for retryWithBackoff from index.ts to streamline exports.
* test: add $pullAll coverage for ConversationTag and PermissionService
Add integration tests for deleteConversationTag verifying $pullAll
removes tags from conversations correctly, and for
syncUserEntraGroupMemberships verifying $pullAll removes user from
non-matching Entra groups while preserving local group membership.
---------
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-02-13 02:14:34 -05:00
|
|
|
|
|
|
|
|
jest.mock('~/server/services/PluginService', () => ({
|
|
|
|
|
updateUserPluginAuth: jest.fn(),
|
|
|
|
|
deleteUserPluginAuth: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('~/server/services/AuthService', () => ({
|
|
|
|
|
verifyEmail: jest.fn(),
|
|
|
|
|
resendVerificationEmail: jest.fn(),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('~/server/services/Files/S3/crud', () => ({
|
|
|
|
|
needsRefresh: jest.fn(),
|
|
|
|
|
getNewS3URL: jest.fn(),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('~/server/services/Files/process', () => ({
|
|
|
|
|
processDeleteRequest: jest.fn().mockResolvedValue(undefined),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('~/server/services/Config', () => ({
|
|
|
|
|
getAppConfig: jest.fn().mockResolvedValue({}),
|
|
|
|
|
getMCPManager: jest.fn(),
|
|
|
|
|
getFlowStateManager: jest.fn(),
|
|
|
|
|
getMCPServersRegistry: jest.fn(),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
jest.mock('~/cache', () => ({
|
|
|
|
|
getLogStores: jest.fn(),
|
|
|
|
|
}));
|
|
|
|
|
|
|
|
|
|
let mongoServer;
|
|
|
|
|
|
|
|
|
|
beforeAll(async () => {
|
|
|
|
|
mongoServer = await MongoMemoryServer.create();
|
|
|
|
|
await mongoose.connect(mongoServer.getUri());
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
afterAll(async () => {
|
|
|
|
|
await mongoose.disconnect();
|
|
|
|
|
await mongoServer.stop();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
afterEach(async () => {
|
|
|
|
|
const collections = mongoose.connection.collections;
|
|
|
|
|
for (const key in collections) {
|
|
|
|
|
await collections[key].deleteMany({});
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const { deleteUserController } = require('./UserController');
|
|
|
|
|
const { Group } = require('~/db/models');
|
|
|
|
|
const { deleteConvos } = require('~/models');
|
|
|
|
|
|
|
|
|
|
describe('deleteUserController', () => {
|
|
|
|
|
const mockRes = {
|
|
|
|
|
status: jest.fn().mockReturnThis(),
|
|
|
|
|
send: jest.fn().mockReturnThis(),
|
|
|
|
|
json: jest.fn().mockReturnThis(),
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
beforeEach(() => {
|
|
|
|
|
jest.clearAllMocks();
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should return 200 on successful deletion', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
const req = { user: { id: userId.toString(), _id: userId, email: 'test@test.com' } };
|
|
|
|
|
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
expect(mockRes.status).toHaveBeenCalledWith(200);
|
|
|
|
|
expect(mockRes.send).toHaveBeenCalledWith({ message: 'User deleted' });
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should remove the user from all groups via $pullAll', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
const userIdStr = userId.toString();
|
|
|
|
|
const otherUser = new mongoose.Types.ObjectId().toString();
|
|
|
|
|
|
|
|
|
|
await Group.create([
|
|
|
|
|
{ name: 'Group A', memberIds: [userIdStr, otherUser], source: 'local' },
|
|
|
|
|
{ name: 'Group B', memberIds: [userIdStr], source: 'local' },
|
|
|
|
|
{ name: 'Group C', memberIds: [otherUser], source: 'local' },
|
|
|
|
|
]);
|
|
|
|
|
|
|
|
|
|
const req = { user: { id: userIdStr, _id: userId, email: 'del@test.com' } };
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
const groups = await Group.find({}).sort({ name: 1 }).lean();
|
|
|
|
|
expect(groups[0].memberIds).toEqual([otherUser]);
|
|
|
|
|
expect(groups[1].memberIds).toEqual([]);
|
|
|
|
|
expect(groups[2].memberIds).toEqual([otherUser]);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should handle user that exists in no groups', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
await Group.create({ name: 'Empty', memberIds: ['someone-else'], source: 'local' });
|
|
|
|
|
|
|
|
|
|
const req = { user: { id: userId.toString(), _id: userId, email: 'no-groups@test.com' } };
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
expect(mockRes.status).toHaveBeenCalledWith(200);
|
|
|
|
|
const group = await Group.findOne({ name: 'Empty' }).lean();
|
|
|
|
|
expect(group.memberIds).toEqual(['someone-else']);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should remove duplicate memberIds if the user appears more than once', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
const userIdStr = userId.toString();
|
|
|
|
|
|
|
|
|
|
await Group.create({
|
|
|
|
|
name: 'Dupes',
|
|
|
|
|
memberIds: [userIdStr, 'other', userIdStr],
|
|
|
|
|
source: 'local',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const req = { user: { id: userIdStr, _id: userId, email: 'dupe@test.com' } };
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
const group = await Group.findOne({ name: 'Dupes' }).lean();
|
|
|
|
|
expect(group.memberIds).toEqual(['other']);
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should still succeed when deleteConvos throws', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
deleteConvos.mockRejectedValueOnce(new Error('no convos'));
|
|
|
|
|
|
|
|
|
|
const req = { user: { id: userId.toString(), _id: userId, email: 'convos@test.com' } };
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
expect(mockRes.status).toHaveBeenCalledWith(200);
|
|
|
|
|
expect(mockRes.send).toHaveBeenCalledWith({ message: 'User deleted' });
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should return 500 when a critical operation fails', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
const { deleteMessages } = require('~/models');
|
|
|
|
|
deleteMessages.mockRejectedValueOnce(new Error('db down'));
|
|
|
|
|
|
|
|
|
|
const req = { user: { id: userId.toString(), _id: userId, email: 'fail@test.com' } };
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
expect(mockRes.status).toHaveBeenCalledWith(500);
|
|
|
|
|
expect(mockRes.json).toHaveBeenCalledWith({ message: 'Something went wrong.' });
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
it('should use string user.id (not ObjectId user._id) for memberIds removal', async () => {
|
|
|
|
|
const userId = new mongoose.Types.ObjectId();
|
|
|
|
|
const userIdStr = userId.toString();
|
|
|
|
|
const otherUser = 'other-user-id';
|
|
|
|
|
|
|
|
|
|
await Group.create({
|
|
|
|
|
name: 'StringCheck',
|
|
|
|
|
memberIds: [userIdStr, otherUser],
|
|
|
|
|
source: 'local',
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const req = { user: { id: userIdStr, _id: userId, email: 'stringcheck@test.com' } };
|
|
|
|
|
await deleteUserController(req, mockRes);
|
|
|
|
|
|
|
|
|
|
const group = await Group.findOne({ name: 'StringCheck' }).lean();
|
|
|
|
|
expect(group.memberIds).toEqual([otherUser]);
|
|
|
|
|
expect(group.memberIds).not.toContain(userIdStr);
|
|
|
|
|
});
|
|
|
|
|
});
|