Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-22 11:20:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci: update related tests

Browse source
This commit is contained in:
Danny Avila 2025-08-18 01:57:57 -04:00
parent 8f89fdc802
commit 1168a7d82e
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
10 changed files with 169 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

42
api/models/Conversation.spec.js
View file

@ -13,9 +13,9 @@ const {
saveConvo, saveConvo,
getConvo, getConvo,
} = require('./Conversation'); } = require('./Conversation');
jest.mock('~/server/services/Config/getCustomConfig'); jest.mock('~/server/services/Config/app');
jest.mock('./Message'); jest.mock('./Message');
const { getCustomConfig } = require('~/server/services/Config/getCustomConfig'); const { getAppConfig } = require('~/server/services/Config/app');
const { getMessages, deleteMessages } = require('./Message'); const { getMessages, deleteMessages } = require('./Message');
const { Conversation } = require('~/db/models'); const { Conversation } = require('~/db/models');
@ -118,9 +118,9 @@ describe('Conversation Operations', () => {
describe('isTemporary conversation handling', () => { describe('isTemporary conversation handling', () => {
it('should save a conversation with expiredAt when isTemporary is true', async () => { it('should save a conversation with expiredAt when isTemporary is true', async () => {
// Mock custom config with 24 hour retention // Mock app config with 24 hour retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 24, temporaryChatRetention: 24,
}, },
}); });
@ -167,9 +167,9 @@ describe('Conversation Operations', () => {
}); });
it('should use custom retention period from config', async () => { it('should use custom retention period from config', async () => {
// Mock custom config with 48 hour retention // Mock app config with 48 hour retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 48, temporaryChatRetention: 48,
}, },
}); });
@ -194,9 +194,9 @@ describe('Conversation Operations', () => {
}); });
it('should handle minimum retention period (1 hour)', async () => { it('should handle minimum retention period (1 hour)', async () => {
// Mock custom config with less than minimum retention // Mock app config with less than minimum retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 0.5, // Half hour - should be clamped to 1 hour temporaryChatRetention: 0.5, // Half hour - should be clamped to 1 hour
}, },
}); });
@ -221,9 +221,9 @@ describe('Conversation Operations', () => {
}); });
it('should handle maximum retention period (8760 hours)', async () => { it('should handle maximum retention period (8760 hours)', async () => {
// Mock custom config with more than maximum retention // Mock app config with more than maximum retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 10000, // Should be clamped to 8760 hours temporaryChatRetention: 10000, // Should be clamped to 8760 hours
}, },
}); });
@ -247,9 +247,9 @@ describe('Conversation Operations', () => {
); );
}); });
it('should handle getCustomConfig errors gracefully', async () => { it('should handle getAppConfig errors gracefully', async () => {
// Mock getCustomConfig to throw an error // Mock getAppConfig to throw an error
getCustomConfig.mockRejectedValue(new Error('Config service unavailable')); getAppConfig.mockRejectedValue(new Error('Config service unavailable'));
mockReq.body = { isTemporary: true }; mockReq.body = { isTemporary: true };
@ -261,8 +261,8 @@ describe('Conversation Operations', () => {
}); });
it('should use default retention when config is not provided', async () => { it('should use default retention when config is not provided', async () => {
// Mock getCustomConfig to return empty config // Mock getAppConfig to return empty config
getCustomConfig.mockResolvedValue({}); getAppConfig.mockResolvedValue({});
mockReq.body = { isTemporary: true }; mockReq.body = { isTemporary: true };
@ -285,8 +285,8 @@ describe('Conversation Operations', () => {
it('should update expiredAt when saving existing temporary conversation', async () => { it('should update expiredAt when saving existing temporary conversation', async () => {
// First save a temporary conversation // First save a temporary conversation
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 24, temporaryChatRetention: 24,
}, },
}); });

46
api/models/Message.spec.js
View file

@ -13,8 +13,8 @@ const {
deleteMessagesSince, deleteMessagesSince,
} = require('./Message'); } = require('./Message');
jest.mock('~/server/services/Config/getCustomConfig'); jest.mock('~/server/services/Config/app');
const { getCustomConfig } = require('~/server/services/Config/getCustomConfig'); const { getAppConfig } = require('~/server/services/Config/app');
/** /**
* @type {import('mongoose').Model<import('@librechat/data-schemas').IMessage>} * @type {import('mongoose').Model<import('@librechat/data-schemas').IMessage>}
@ -326,9 +326,9 @@ describe('Message Operations', () => {
}); });
it('should save a message with expiredAt when isTemporary is true', async () => { it('should save a message with expiredAt when isTemporary is true', async () => {
// Mock custom config with 24 hour retention // Mock app config with 24 hour retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 24, temporaryChatRetention: 24,
}, },
}); });
@ -375,9 +375,9 @@ describe('Message Operations', () => {
}); });
it('should use custom retention period from config', async () => { it('should use custom retention period from config', async () => {
// Mock custom config with 48 hour retention // Mock app config with 48 hour retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 48, temporaryChatRetention: 48,
}, },
}); });
@ -402,9 +402,9 @@ describe('Message Operations', () => {
}); });
it('should handle minimum retention period (1 hour)', async () => { it('should handle minimum retention period (1 hour)', async () => {
// Mock custom config with less than minimum retention // Mock app config with less than minimum retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 0.5, // Half hour - should be clamped to 1 hour temporaryChatRetention: 0.5, // Half hour - should be clamped to 1 hour
}, },
}); });
@ -429,9 +429,9 @@ describe('Message Operations', () => {
}); });
it('should handle maximum retention period (8760 hours)', async () => { it('should handle maximum retention period (8760 hours)', async () => {
// Mock custom config with more than maximum retention // Mock app config with more than maximum retention
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 10000, // Should be clamped to 8760 hours temporaryChatRetention: 10000, // Should be clamped to 8760 hours
}, },
}); });
@ -455,9 +455,9 @@ describe('Message Operations', () => {
); );
}); });
it('should handle getCustomConfig errors gracefully', async () => { it('should handle getAppConfig errors gracefully', async () => {
// Mock getCustomConfig to throw an error // Mock getAppConfig to throw an error
getCustomConfig.mockRejectedValue(new Error('Config service unavailable')); getAppConfig.mockRejectedValue(new Error('Config service unavailable'));
mockReq.body = { isTemporary: true }; mockReq.body = { isTemporary: true };
@ -469,8 +469,8 @@ describe('Message Operations', () => {
}); });
it('should use default retention when config is not provided', async () => { it('should use default retention when config is not provided', async () => {
// Mock getCustomConfig to return empty config // Mock getAppConfig to return empty config
getCustomConfig.mockResolvedValue({}); getAppConfig.mockResolvedValue({});
mockReq.body = { isTemporary: true }; mockReq.body = { isTemporary: true };
@ -493,8 +493,8 @@ describe('Message Operations', () => {
it('should not update expiredAt on message update', async () => { it('should not update expiredAt on message update', async () => {
// First save a temporary message // First save a temporary message
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 24, temporaryChatRetention: 24,
}, },
}); });
@ -520,8 +520,8 @@ describe('Message Operations', () => {
it('should preserve expiredAt when saving existing temporary message', async () => { it('should preserve expiredAt when saving existing temporary message', async () => {
// First save a temporary message // First save a temporary message
getCustomConfig.mockResolvedValue({ getAppConfig.mockResolvedValue({
interface: { interfaceConfig: {
temporaryChatRetention: 24, temporaryChatRetention: 24,
}, },
}); });

27
api/server/controllers/PluginController.spec.js
View file

@ -1,8 +1,7 @@
const { Constants } = require('librechat-data-provider'); const { Constants } = require('librechat-data-provider');
const { getCustomConfig, getCachedTools, getAppConfig } = require('~/server/services/Config'); const { getCachedTools, getAppConfig } = require('~/server/services/Config');
const { getLogStores } = require('~/cache'); const { getLogStores } = require('~/cache');
// Mock the dependencies
jest.mock('@librechat/data-schemas', () => ({ jest.mock('@librechat/data-schemas', () => ({
logger: { logger: {
debug: jest.fn(), debug: jest.fn(),
@ -11,7 +10,6 @@ jest.mock('@librechat/data-schemas', () => ({
})); }));
jest.mock('~/server/services/Config', () => ({ jest.mock('~/server/services/Config', () => ({
getCustomConfig: jest.fn(),
getCachedTools: jest.fn(), getCachedTools: jest.fn(),
getAppConfig: jest.fn(), getAppConfig: jest.fn(),
})); }));
@ -162,7 +160,6 @@ describe('PluginController', () => {
getCachedTools.mockResolvedValueOnce(mockUserTools); getCachedTools.mockResolvedValueOnce(mockUserTools);
convertMCPToolsToPlugins.mockReturnValue(mockConvertedPlugins); convertMCPToolsToPlugins.mockReturnValue(mockConvertedPlugins);
filterUniquePlugins.mockImplementation((plugins) => plugins); filterUniquePlugins.mockImplementation((plugins) => plugins);
getCustomConfig.mockResolvedValue(null);
await getAvailableTools(mockReq, mockRes); await getAvailableTools(mockReq, mockRes);
@ -184,7 +181,6 @@ describe('PluginController', () => {
getCachedTools.mockResolvedValueOnce({}); getCachedTools.mockResolvedValueOnce({});
convertMCPToolsToPlugins.mockReturnValue(mockUserPlugins); convertMCPToolsToPlugins.mockReturnValue(mockUserPlugins);
filterUniquePlugins.mockReturnValue([...mockUserPlugins, ...mockManifestPlugins]); filterUniquePlugins.mockReturnValue([...mockUserPlugins, ...mockManifestPlugins]);
getCustomConfig.mockResolvedValue(null);
await getAvailableTools(mockReq, mockRes); await getAvailableTools(mockReq, mockRes);
@ -203,7 +199,6 @@ describe('PluginController', () => {
convertMCPToolsToPlugins.mockReturnValue([]); convertMCPToolsToPlugins.mockReturnValue([]);
filterUniquePlugins.mockReturnValue([mockPlugin]); filterUniquePlugins.mockReturnValue([mockPlugin]);
checkPluginAuth.mockReturnValue(true); checkPluginAuth.mockReturnValue(true);
getCustomConfig.mockResolvedValue(null);
// Mock getCachedTools second call to return tool definitions // Mock getCachedTools second call to return tool definitions
getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({ tool1: true }); getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({ tool1: true });
@ -227,7 +222,6 @@ describe('PluginController', () => {
filterUniquePlugins.mockReturnValue([mockToolkit]); filterUniquePlugins.mockReturnValue([mockToolkit]);
checkPluginAuth.mockReturnValue(false); checkPluginAuth.mockReturnValue(false);
getToolkitKey.mockReturnValue('toolkit1'); getToolkitKey.mockReturnValue('toolkit1');
getCustomConfig.mockResolvedValue(null);
// Mock getCachedTools second call to return tool definitions // Mock getCachedTools second call to return tool definitions
getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({ getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({
@ -243,7 +237,6 @@ describe('PluginController', () => {
describe('plugin.icon behavior', () => { describe('plugin.icon behavior', () => {
const callGetAvailableToolsWithMCPServer = async (serverConfig) => { const callGetAvailableToolsWithMCPServer = async (serverConfig) => {
mockCache.get.mockResolvedValue(null); mockCache.get.mockResolvedValue(null);
getCustomConfig.mockResolvedValue(null);
const functionTools = { const functionTools = {
[`test-tool${Constants.mcp_delimiter}test-server`]: { [`test-tool${Constants.mcp_delimiter}test-server`]: {
@ -299,8 +292,8 @@ describe('PluginController', () => {
describe('helper function integration', () => { describe('helper function integration', () => {
it('should properly handle MCP tools with custom user variables', async () => { it('should properly handle MCP tools with custom user variables', async () => {
const customConfig = { const appConfig = {
mcpServers: { mcpConfig: {
'test-server': { 'test-server': {
customUserVars: { customUserVars: {
API_KEY: { title: 'API Key', description: 'Your API key' }, API_KEY: { title: 'API Key', description: 'Your API key' },
@ -327,7 +320,7 @@ describe('PluginController', () => {
require('~/config').getMCPManager.mockReturnValue(mockMCPManager); require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
mockCache.get.mockResolvedValue(null); mockCache.get.mockResolvedValue(null);
getCustomConfig.mockResolvedValue(customConfig); getAppConfig.mockResolvedValue(appConfig);
// First call returns user tools (empty in this case) // First call returns user tools (empty in this case)
getCachedTools.mockResolvedValueOnce({}); getCachedTools.mockResolvedValueOnce({});
@ -387,7 +380,6 @@ describe('PluginController', () => {
getCachedTools.mockResolvedValue(null); getCachedTools.mockResolvedValue(null);
convertMCPToolsToPlugins.mockReturnValue(undefined); convertMCPToolsToPlugins.mockReturnValue(undefined);
filterUniquePlugins.mockImplementation((plugins) => plugins || []); filterUniquePlugins.mockImplementation((plugins) => plugins || []);
getCustomConfig.mockResolvedValue(null);
await getAvailableTools(mockReq, mockRes); await getAvailableTools(mockReq, mockRes);
@ -402,7 +394,6 @@ describe('PluginController', () => {
getCachedTools.mockResolvedValue(undefined); getCachedTools.mockResolvedValue(undefined);
convertMCPToolsToPlugins.mockReturnValue(undefined); convertMCPToolsToPlugins.mockReturnValue(undefined);
filterUniquePlugins.mockImplementation((plugins) => plugins || []); filterUniquePlugins.mockImplementation((plugins) => plugins || []);
getCustomConfig.mockResolvedValue(null);
checkPluginAuth.mockReturnValue(false); checkPluginAuth.mockReturnValue(false);
// Mock getCachedTools to return undefined for both calls // Mock getCachedTools to return undefined for both calls
@ -440,7 +431,6 @@ describe('PluginController', () => {
getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({}); getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce({});
convertMCPToolsToPlugins.mockReturnValue([]); convertMCPToolsToPlugins.mockReturnValue([]);
filterUniquePlugins.mockImplementation((plugins) => plugins || []); filterUniquePlugins.mockImplementation((plugins) => plugins || []);
getCustomConfig.mockResolvedValue(null);
checkPluginAuth.mockReturnValue(true); checkPluginAuth.mockReturnValue(true);
await getAvailableTools(mockReq, mockRes); await getAvailableTools(mockReq, mockRes);
@ -467,12 +457,16 @@ describe('PluginController', () => {
// Mock the MCP manager to return server config without customUserVars // Mock the MCP manager to return server config without customUserVars
const mockMCPManager = { const mockMCPManager = {
loadManifestTools: jest.fn().mockResolvedValue([]), loadManifestTools: jest.fn().mockResolvedValue([]),
getRawConfig: jest.fn(), getRawConfig: jest.fn().mockReturnValue(customConfig.mcpServers['test-server']),
}; };
require('~/config').getMCPManager.mockReturnValue(mockMCPManager); require('~/config').getMCPManager.mockReturnValue(mockMCPManager);
mockCache.get.mockResolvedValue(null); mockCache.get.mockResolvedValue(null);
getCustomConfig.mockResolvedValue(customConfig); getAppConfig.mockResolvedValue({
mcpConfig: customConfig.mcpServers,
filteredTools: [],
includedTools: [],
});
getCachedTools.mockResolvedValueOnce(mockUserTools); getCachedTools.mockResolvedValueOnce(mockUserTools);
const mockPlugin = { const mockPlugin = {
@ -525,7 +519,6 @@ describe('PluginController', () => {
filterUniquePlugins.mockReturnValue([mockToolkit]); filterUniquePlugins.mockReturnValue([mockToolkit]);
checkPluginAuth.mockReturnValue(false); checkPluginAuth.mockReturnValue(false);
getToolkitKey.mockReturnValue(undefined); getToolkitKey.mockReturnValue(undefined);
getCustomConfig.mockResolvedValue(null);
// Mock getCachedTools second call to return null // Mock getCachedTools second call to return null
getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce(null); getCachedTools.mockResolvedValueOnce({}).mockResolvedValueOnce(null);

1
api/server/index.spec.js
View file

@ -5,7 +5,6 @@ const mongoose = require('mongoose');
jest.mock('~/server/services/Config', () => ({ jest.mock('~/server/services/Config', () => ({
loadCustomConfig: jest.fn(() => Promise.resolve({})), loadCustomConfig: jest.fn(() => Promise.resolve({})),
getCustomConfig: jest.fn(() => Promise.resolve({})),
setAppConfig: jest.fn(), setAppConfig: jest.fn(),
getAppConfig: jest.fn().mockResolvedValue({ getAppConfig: jest.fn().mockResolvedValue({
paths: { paths: {

19
api/server/routes/files/multer.spec.js
View file

@ -338,11 +338,11 @@ describe('Multer Configuration', () => {
}); });
it('should use real config merging', async () => { it('should use real config merging', async () => {
const { getCustomConfig } = require('~/server/services/Config'); const { getAppConfig } = require('~/server/services/Config');
const multerInstance = await createMulterInstance(); const multerInstance = await createMulterInstance();
expect(getCustomConfig).toHaveBeenCalled(); expect(getAppConfig).toHaveBeenCalled();
expect(multerInstance).toBeDefined(); expect(multerInstance).toBeDefined();
}); });
@ -557,25 +557,28 @@ describe('Multer Configuration', () => {
}); });
it('should properly integrate real fileConfig with custom endpoints', async () => { it('should properly integrate real fileConfig with custom endpoints', async () => {
const { getCustomConfig } = require('~/server/services/Config'); const { getAppConfig } = require('~/server/services/Config');
// Mock a custom config with additional endpoints // Mock appConfig with fileConfig
getCustomConfig.mockResolvedValueOnce({ getAppConfig.mockResolvedValueOnce({
paths: {
uploads: tempDir,
},
fileConfig: { fileConfig: {
endpoints: { endpoints: {
anthropic: { anthropic: {
supportedMimeTypes: ['text/plain', 'image/png'], supportedMimeTypes: ['text/plain', 'image/png'],
}, },
}, },
serverFileSizeLimit: 20, // 20 MB serverFileSizeLimit: 20971520, // 20 MB in bytes (mergeFileConfig converts)
}, },
}); });
const multerInstance = await createMulterInstance(); const multerInstance = await createMulterInstance();
expect(multerInstance).toBeDefined(); expect(multerInstance).toBeDefined();
// Verify that getCustomConfig was called (we can't spy on the actual merge function easily) // Verify that getAppConfig was called
expect(getCustomConfig).toHaveBeenCalled(); expect(getAppConfig).toHaveBeenCalled();
}); });
}); });
}); });

1
api/server/routes/prompts.test.js
View file

@ -14,7 +14,6 @@ const {
// Mock modules before importing // Mock modules before importing
jest.mock('~/server/services/Config', () => ({ jest.mock('~/server/services/Config', () => ({
getCachedTools: jest.fn().mockResolvedValue({}), getCachedTools: jest.fn().mockResolvedValue({}),
getCustomConfig: jest.fn(),
})); }));
jest.mock('~/models/Role', () => ({ jest.mock('~/models/Role', () => ({

22
api/server/services/AppService.spec.js
View file

@ -134,11 +134,14 @@ describe('AppService', () => {
expect(process.env.CDN_PROVIDER).toEqual('testStrategy'); expect(process.env.CDN_PROVIDER).toEqual('testStrategy');
expect(setAppConfig).toHaveBeenCalledWith({ expect(setAppConfig).toHaveBeenCalledWith(
expect.objectContaining({
config: expect.objectContaining({ config: expect.objectContaining({
fileStrategy: 'testStrategy', fileStrategy: 'testStrategy',
}), }),
registration: expect.objectContaining({
socialLogins: ['testLogin'], socialLogins: ['testLogin'],
}),
fileStrategy: 'testStrategy', fileStrategy: 'testStrategy',
interfaceConfig: expect.objectContaining({ interfaceConfig: expect.objectContaining({
endpointsMenu: true, endpointsMenu: true,
@ -158,7 +161,7 @@ describe('AppService', () => {
balance: { enabled: true }, balance: { enabled: true },
filteredTools: undefined, filteredTools: undefined,
includedTools: undefined, includedTools: undefined,
webSearch: { webSearch: expect.objectContaining({
safeSearch: 1, safeSearch: 1,
jinaApiKey: '${JINA_API_KEY}', jinaApiKey: '${JINA_API_KEY}',
cohereApiKey: '${COHERE_API_KEY}', cohereApiKey: '${COHERE_API_KEY}',
@ -167,16 +170,17 @@ describe('AppService', () => {
firecrawlApiKey: '${FIRECRAWL_API_KEY}', firecrawlApiKey: '${FIRECRAWL_API_KEY}',
firecrawlApiUrl: '${FIRECRAWL_API_URL}', firecrawlApiUrl: '${FIRECRAWL_API_URL}',
searxngInstanceUrl: '${SEARXNG_INSTANCE_URL}', searxngInstanceUrl: '${SEARXNG_INSTANCE_URL}',
}, }),
memory: undefined, memory: undefined,
agents: { agents: expect.objectContaining({
disableBuilder: false, disableBuilder: false,
capabilities: expect.arrayContaining([...defaultAgentCapabilities]), capabilities: expect.arrayContaining([...defaultAgentCapabilities]),
maxCitations: 30, maxCitations: 30,
maxCitationsPerFile: 7, maxCitationsPerFile: 7,
minRelevanceScore: 0.45, minRelevanceScore: 0.45,
}, }),
}); }),
);
}); });
it('should log a warning if the config version is outdated', async () => { it('should log a warning if the config version is outdated', async () => {
@ -261,6 +265,8 @@ describe('AppService', () => {
adminFilter: undefined, adminFilter: undefined,
adminIncluded: undefined, adminIncluded: undefined,
directory: expect.anything(), directory: expect.anything(),
imageOutputType: expect.any(String),
fileStrategy: expect.any(String),
}); });
// Verify setCachedTools was called with the tools // Verify setCachedTools was called with the tools
@ -818,7 +824,9 @@ describe('AppService updating app config and issuing warnings', () => {
paths: expect.anything(), paths: expect.anything(),
config: {}, config: {},
fileStrategy: FileSources.local, fileStrategy: FileSources.local,
registration: expect.objectContaining({
socialLogins: defaultSocialLogins, socialLogins: defaultSocialLogins,
}),
balance: expect.objectContaining({ balance: expect.objectContaining({
enabled: false, enabled: false,
startBalance: undefined, startBalance: undefined,
@ -850,7 +858,9 @@ describe('AppService updating app config and issuing warnings', () => {
paths: expect.anything(), paths: expect.anything(),
config: customConfig, config: customConfig,
fileStrategy: customConfig.fileStrategy, fileStrategy: customConfig.fileStrategy,
registration: expect.objectContaining({
socialLogins: customConfig.registration.socialLogins, socialLogins: customConfig.registration.socialLogins,
}),
balance: customConfig.balance, balance: customConfig.balance,
}), }),
); );

2
api/server/services/Config/loadConfigModels.spec.js
View file

@ -5,7 +5,7 @@ const { getAppConfig } = require('./app');
jest.mock('~/server/services/ModelService'); jest.mock('~/server/services/ModelService');
jest.mock('./getCustomConfig'); jest.mock('./getCustomConfig');
jest.mock('./getAppConfig'); jest.mock('./app');
const exampleConfig = { const exampleConfig = {
endpoints: { endpoints: {

11
api/server/services/MCP.spec.js
View file

@ -25,6 +25,7 @@ jest.mock('librechat-data-provider', () => ({
jest.mock('./Config', () => ({ jest.mock('./Config', () => ({
loadCustomConfig: jest.fn(), loadCustomConfig: jest.fn(),
getAppConfig: jest.fn(),
})); }));
jest.mock('~/config', () => ({ jest.mock('~/config', () => ({
@ -65,8 +66,10 @@ describe('tests for the new helper functions used by the MCP connection status e
server2: { type: 'http' }, server2: { type: 'http' },
}, },
}; };
let mockGetAppConfig;
beforeEach(() => { beforeEach(() => {
mockGetAppConfig = require('./Config').getAppConfig;
mockGetMCPManager.mockReturnValue({ mockGetMCPManager.mockReturnValue({
getAllConnections: jest.fn(() => new Map()), getAllConnections: jest.fn(() => new Map()),
getUserConnections: jest.fn(() => new Map()), getUserConnections: jest.fn(() => new Map()),
@ -75,7 +78,7 @@ describe('tests for the new helper functions used by the MCP connection status e
}); });
it('should successfully return MCP setup data', async () => { it('should successfully return MCP setup data', async () => {
mockLoadCustomConfig.mockResolvedValue(mockConfig); mockGetAppConfig.mockResolvedValue({ mcpConfig: mockConfig.mcpServers });
const mockAppConnections = new Map([['server1', { status: 'connected' }]]); const mockAppConnections = new Map([['server1', { status: 'connected' }]]);
const mockUserConnections = new Map([['server2', { status: 'disconnected' }]]); const mockUserConnections = new Map([['server2', { status: 'disconnected' }]]);
@ -90,7 +93,7 @@ describe('tests for the new helper functions used by the MCP connection status e
const result = await getMCPSetupData(mockUserId); const result = await getMCPSetupData(mockUserId);
expect(mockLoadCustomConfig).toHaveBeenCalledWith(false); expect(mockGetAppConfig).toHaveBeenCalled();
expect(mockGetMCPManager).toHaveBeenCalledWith(mockUserId); expect(mockGetMCPManager).toHaveBeenCalledWith(mockUserId);
expect(mockMCPManager.getAllConnections).toHaveBeenCalled(); expect(mockMCPManager.getAllConnections).toHaveBeenCalled();
expect(mockMCPManager.getUserConnections).toHaveBeenCalledWith(mockUserId); expect(mockMCPManager.getUserConnections).toHaveBeenCalledWith(mockUserId);
@ -105,12 +108,12 @@ describe('tests for the new helper functions used by the MCP connection status e
}); });
it('should throw error when MCP config not found', async () => { it('should throw error when MCP config not found', async () => {
mockLoadCustomConfig.mockResolvedValue({}); mockGetAppConfig.mockResolvedValue({});
await expect(getMCPSetupData(mockUserId)).rejects.toThrow('MCP config not found'); await expect(getMCPSetupData(mockUserId)).rejects.toThrow('MCP config not found');
}); });
it('should handle null values from MCP manager gracefully', async () => { it('should handle null values from MCP manager gracefully', async () => {
mockLoadCustomConfig.mockResolvedValue(mockConfig); mockGetAppConfig.mockResolvedValue({ mcpConfig: mockConfig.mcpServers });
const mockMCPManager = { const mockMCPManager = {
getAllConnections: jest.fn(() => null), getAllConnections: jest.fn(() => null),

77
api/server/services/domains.spec.js
View file

@ -25,14 +25,14 @@ describe('isEmailDomainAllowed', () => {
it('should return true if customConfig is not available', async () => { it('should return true if customConfig is not available', async () => {
const email = 'test@domain1.com'; const email = 'test@domain1.com';
getCustomConfig.mockResolvedValue(null); getCustomConfig.mockResolvedValue(null);
const result = await isEmailDomainAllowed(email); const result = await isEmailDomainAllowed(email, null);
expect(result).toBe(true); expect(result).toBe(true);
}); });
it('should return true if allowedDomains is not defined in customConfig', async () => { it('should return true if allowedDomains is not defined in customConfig', async () => {
const email = 'test@domain1.com'; const email = 'test@domain1.com';
getCustomConfig.mockResolvedValue({}); getCustomConfig.mockResolvedValue({});
const result = await isEmailDomainAllowed(email); const result = await isEmailDomainAllowed(email, undefined);
expect(result).toBe(true); expect(result).toBe(true);
}); });
@ -43,7 +43,7 @@ describe('isEmailDomainAllowed', () => {
allowedDomains: ['domain1.com', 'domain2.com'], allowedDomains: ['domain1.com', 'domain2.com'],
}, },
}); });
const result = await isEmailDomainAllowed(email); const result = await isEmailDomainAllowed(email, ['domain1.com', 'domain2.com']);
expect(result).toBe(true); expect(result).toBe(true);
}); });
@ -54,7 +54,7 @@ describe('isEmailDomainAllowed', () => {
allowedDomains: ['domain1.com', 'domain2.com'], allowedDomains: ['domain1.com', 'domain2.com'],
}, },
}); });
const result = await isEmailDomainAllowed(email); const result = await isEmailDomainAllowed(email, ['domain1.com', 'domain2.com']);
expect(result).toBe(false); expect(result).toBe(false);
}); });
}); });
@ -83,8 +83,8 @@ describe('isActionDomainAllowed', () => {
getCustomConfig.mockResolvedValue({ getCustomConfig.mockResolvedValue({
actions: { allowedDomains: ['http://', 'https://'] }, actions: { allowedDomains: ['http://', 'https://'] },
}); });
expect(await isActionDomainAllowed('http://')).toBe(false); expect(await isActionDomainAllowed('http://', ['http://', 'https://'])).toBe(false);
expect(await isActionDomainAllowed('https://')).toBe(false); expect(await isActionDomainAllowed('https://', ['http://', 'https://'])).toBe(false);
}); });
}); });
@ -92,102 +92,107 @@ describe('isActionDomainAllowed', () => {
describe('configuration handling', () => { describe('configuration handling', () => {
it('should return true if customConfig is null', async () => { it('should return true if customConfig is null', async () => {
getCustomConfig.mockResolvedValue(null); getCustomConfig.mockResolvedValue(null);
expect(await isActionDomainAllowed('example.com')).toBe(true); expect(await isActionDomainAllowed('example.com', null)).toBe(true);
}); });
it('should return true if actions.allowedDomains is not defined', async () => { it('should return true if actions.allowedDomains is not defined', async () => {
getCustomConfig.mockResolvedValue({}); getCustomConfig.mockResolvedValue({});
expect(await isActionDomainAllowed('example.com')).toBe(true); expect(await isActionDomainAllowed('example.com', undefined)).toBe(true);
}); });
it('should return true if allowedDomains is empty array', async () => { it('should return true if allowedDomains is empty array', async () => {
getCustomConfig.mockResolvedValue({ getCustomConfig.mockResolvedValue({
actions: { allowedDomains: [] }, actions: { allowedDomains: [] },
}); });
expect(await isActionDomainAllowed('example.com')).toBe(true); expect(await isActionDomainAllowed('example.com', [])).toBe(true);
}); });
}); });
// Domain Matching Tests // Domain Matching Tests
describe('domain matching', () => { describe('domain matching', () => {
beforeEach(() => { const allowedDomains = [
getCustomConfig.mockResolvedValue({
actions: {
allowedDomains: [
'example.com', 'example.com',
'*.subdomain.com', '*.subdomain.com',
'specific.domain.com', 'specific.domain.com',
'www.withprefix.com', 'www.withprefix.com',
'swapi.dev', 'swapi.dev',
], ];
beforeEach(() => {
getCustomConfig.mockResolvedValue({
actions: {
allowedDomains,
}, },
}); });
}); });
it('should match exact domains', async () => { it('should match exact domains', async () => {
expect(await isActionDomainAllowed('example.com')).toBe(true); expect(await isActionDomainAllowed('example.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('other.com')).toBe(false); expect(await isActionDomainAllowed('other.com', allowedDomains)).toBe(false);
expect(await isActionDomainAllowed('swapi.dev')).toBe(true); expect(await isActionDomainAllowed('swapi.dev', allowedDomains)).toBe(true);
}); });
it('should handle domains with www prefix', async () => { it('should handle domains with www prefix', async () => {
expect(await isActionDomainAllowed('www.example.com')).toBe(true); expect(await isActionDomainAllowed('www.example.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('www.withprefix.com')).toBe(true); expect(await isActionDomainAllowed('www.withprefix.com', allowedDomains)).toBe(true);
}); });
it('should handle full URLs', async () => { it('should handle full URLs', async () => {
expect(await isActionDomainAllowed('https://example.com')).toBe(true); expect(await isActionDomainAllowed('https://example.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('http://example.com')).toBe(true); expect(await isActionDomainAllowed('http://example.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('https://example.com/path')).toBe(true); expect(await isActionDomainAllowed('https://example.com/path', allowedDomains)).toBe(true);
}); });
it('should handle wildcard subdomains', async () => { it('should handle wildcard subdomains', async () => {
expect(await isActionDomainAllowed('test.subdomain.com')).toBe(true); expect(await isActionDomainAllowed('test.subdomain.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('any.subdomain.com')).toBe(true); expect(await isActionDomainAllowed('any.subdomain.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('subdomain.com')).toBe(true); expect(await isActionDomainAllowed('subdomain.com', allowedDomains)).toBe(true);
}); });
it('should handle specific subdomains', async () => { it('should handle specific subdomains', async () => {
expect(await isActionDomainAllowed('specific.domain.com')).toBe(true); expect(await isActionDomainAllowed('specific.domain.com', allowedDomains)).toBe(true);
expect(await isActionDomainAllowed('other.domain.com')).toBe(false); expect(await isActionDomainAllowed('other.domain.com', allowedDomains)).toBe(false);
}); });
}); });
// Edge Cases // Edge Cases
describe('edge cases', () => { describe('edge cases', () => {
const edgeAllowedDomains = ['example.com', '*.test.com'];
beforeEach(() => { beforeEach(() => {
getCustomConfig.mockResolvedValue({ getCustomConfig.mockResolvedValue({
actions: { actions: {
allowedDomains: ['example.com', '*.test.com'], allowedDomains: edgeAllowedDomains,
}, },
}); });
}); });
it('should handle domains with query parameters', async () => { it('should handle domains with query parameters', async () => {
expect(await isActionDomainAllowed('example.com?param=value')).toBe(true); expect(await isActionDomainAllowed('example.com?param=value', edgeAllowedDomains)).toBe(true);
}); });
it('should handle domains with ports', async () => { it('should handle domains with ports', async () => {
expect(await isActionDomainAllowed('example.com:8080')).toBe(true); expect(await isActionDomainAllowed('example.com:8080', edgeAllowedDomains)).toBe(true);
}); });
it('should handle domains with trailing slashes', async () => { it('should handle domains with trailing slashes', async () => {
expect(await isActionDomainAllowed('example.com/')).toBe(true); expect(await isActionDomainAllowed('example.com/', edgeAllowedDomains)).toBe(true);
}); });
it('should handle case insensitivity', async () => { it('should handle case insensitivity', async () => {
expect(await isActionDomainAllowed('EXAMPLE.COM')).toBe(true); expect(await isActionDomainAllowed('EXAMPLE.COM', edgeAllowedDomains)).toBe(true);
expect(await isActionDomainAllowed('Example.Com')).toBe(true); expect(await isActionDomainAllowed('Example.Com', edgeAllowedDomains)).toBe(true);
}); });
it('should handle invalid entries in allowedDomains', async () => { it('should handle invalid entries in allowedDomains', async () => {
const invalidAllowedDomains = ['example.com', null, undefined, '', 'test.com'];
getCustomConfig.mockResolvedValue({ getCustomConfig.mockResolvedValue({
actions: { actions: {
allowedDomains: ['example.com', null, undefined, '', 'test.com'], allowedDomains: invalidAllowedDomains,
}, },
}); });
expect(await isActionDomainAllowed('example.com')).toBe(true); expect(await isActionDomainAllowed('example.com', invalidAllowedDomains)).toBe(true);
expect(await isActionDomainAllowed('test.com')).toBe(true); expect(await isActionDomainAllowed('test.com', invalidAllowedDomains)).toBe(true);
}); });
}); });
}); });