mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-14 06:28:52 +01:00
* ✨feat: OAuth for Actions * WIP: PoC flow state manager * refactor: Add identifier field to token model from action schema * chore: fix potential file type issues * ci: fix type issue with action metadata auth * fix: ensure FlowManagerOptions has a default ttl value * WIP: OAUTH actions * WIP: first pass OAuth Action * fix: standardize identifier usage in OAuth flow handling * fix: update token retrieval to include userId in query and use correct identifier * refacotr: update token retrieval to use userId for OAuth token query * feat: Tool Call Auth styling * fix: streamline token creation and add type field to token schema * refactor: cleanup OAuth flow by encrypting client credentials and ensuring oauth operations only run under condition * refactor: use encrypted credentials in OAuth callback * fix: update Token collection indexes to use expiresAt TTL index and not createdAt legacy index * refactor: enhance Token index cleanup by improving logging and removing redundant index creation logic * refactor: remove unused OAuth login route and related logic for improved clarity * refactor: replace fetch with axios for OAuth token exchange and improve error handling * refactor: better UX after authentication before oauth tool execution * refactor: implement cleanup handlers for FlowStateManager intervals to enhance resource management * refactor: encrypt OAuth tokens before storing and decrypt upon retrieval for enhanced security * refactor: enhance authentication success page with improved styling and countdown feature * refactor: add response_type parameter to OAuth redirect URI for improved compatibility * chore: update translation.json new localizations * chore: remove unused OGDialog import from OGDialogTemplate component * refactor: Actions Auth using new Dialog styling, use same component with Agents/Assistants * refactor: update removeNullishValues function to support removal of empty strings and adjust transform usage in schemas * chore: bump version of librechat-data-provider to 0.7.6991 * refactor: integrate removeNullishValues function to clean metadata before encryption in agent and assistant routes * refactor: update OAuth input fields to use 'password' type for better security * refactor: update localization placeholders for sign-in message to use double curly braces * refactor: add access_type parameter for offline access in createActionTool function * refactor: implement handleOAuthToken function for token management and encryption * feat: refresh token support * refactor: add default expiration for access token and error handling for missing token * feat: localizations for ActionAuth * refactor: set refresh token expiration to null to not expire if expiry never given * fix: prevent crash fromerror within async handleAbortError in AskController, EditController, and AgentController * feat: Action Callback URL * 🌍 i18n: Update translation.json with latest translations * refactor: handle errors in flow state checking to prevent unhandled promise rejections * fix: improve flow state concurrency to prevent multiple token creation calls * refactor: RequestExecutor to use separate axios instance * refactor: improve concurrency flows by keeping completed state until TTL expiry * refactor: increase TTL for flow state management and adjust monitoring interval * ci: mock axios instance creation in actions spec * feat: add Babel and Jest configuration files; implement FlowStateManager tests with concurrency handling * chore: add disableOAuth prop to ActionsAuth (not implemented for Assistants yet) --------- Co-authored-by: Danny Avila <danny@librechat.ai> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
152 lines
4.6 KiB
TypeScript
152 lines
4.6 KiB
TypeScript
import { FlowStateManager } from './manager';
|
|
import Keyv from 'keyv';
|
|
import type { FlowState } from './types';
|
|
|
|
// Create a mock class without extending Keyv
|
|
class MockKeyv {
|
|
private store: Map<string, FlowState<string>>;
|
|
|
|
constructor() {
|
|
this.store = new Map();
|
|
}
|
|
|
|
async get(key: string): Promise<FlowState<string> | undefined> {
|
|
return this.store.get(key);
|
|
}
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
async set(key: string, value: FlowState<string>, _ttl?: number): Promise<true> {
|
|
this.store.set(key, value);
|
|
return true;
|
|
}
|
|
|
|
async delete(key: string): Promise<boolean> {
|
|
return this.store.delete(key);
|
|
}
|
|
}
|
|
|
|
describe('FlowStateManager', () => {
|
|
let flowManager: FlowStateManager<string>;
|
|
let store: MockKeyv;
|
|
|
|
beforeEach(() => {
|
|
store = new MockKeyv();
|
|
// Type assertion here since we know our mock implements the necessary methods
|
|
flowManager = new FlowStateManager(store as unknown as Keyv, { ttl: 30000, ci: true });
|
|
});
|
|
|
|
afterEach(() => {
|
|
jest.clearAllMocks();
|
|
});
|
|
|
|
describe('Concurrency Tests', () => {
|
|
it('should handle concurrent flow creation and return same result', async () => {
|
|
const flowId = 'test-flow';
|
|
const type = 'test-type';
|
|
|
|
// Start two concurrent flow creations
|
|
const flow1Promise = flowManager.createFlowWithHandler(flowId, type, async () => {
|
|
await new Promise((resolve) => setTimeout(resolve, 100));
|
|
return 'result';
|
|
});
|
|
|
|
const flow2Promise = flowManager.createFlowWithHandler(flowId, type, async () => {
|
|
await new Promise((resolve) => setTimeout(resolve, 50));
|
|
return 'different-result';
|
|
});
|
|
|
|
// Both should resolve to the same result from the first handler
|
|
const [result1, result2] = await Promise.all([flow1Promise, flow2Promise]);
|
|
|
|
expect(result1).toBe('result');
|
|
expect(result2).toBe('result');
|
|
});
|
|
|
|
it('should handle flow timeout correctly', async () => {
|
|
const flowId = 'timeout-flow';
|
|
const type = 'test-type';
|
|
|
|
// Create flow with very short TTL
|
|
const shortTtlManager = new FlowStateManager(store as unknown as Keyv, {
|
|
ttl: 100,
|
|
ci: true,
|
|
});
|
|
|
|
const flowPromise = shortTtlManager.createFlow(flowId, type);
|
|
|
|
await expect(flowPromise).rejects.toThrow('test-type flow timed out');
|
|
});
|
|
|
|
it('should maintain flow state consistency under high concurrency', async () => {
|
|
const flowId = 'concurrent-flow';
|
|
const type = 'test-type';
|
|
|
|
// Create multiple concurrent operations
|
|
const operations = [];
|
|
for (let i = 0; i < 10; i++) {
|
|
operations.push(
|
|
flowManager.createFlowWithHandler(flowId, type, async () => {
|
|
await new Promise((resolve) => setTimeout(resolve, Math.random() * 50));
|
|
return `result-${i}`;
|
|
}),
|
|
);
|
|
}
|
|
|
|
// All operations should resolve to the same result
|
|
const results = await Promise.all(operations);
|
|
const firstResult = results[0];
|
|
results.forEach((result: string) => {
|
|
expect(result).toBe(firstResult);
|
|
});
|
|
});
|
|
|
|
it('should handle race conditions in flow completion', async () => {
|
|
const flowId = 'test-flow';
|
|
const type = 'test-type';
|
|
|
|
// Create initial flow
|
|
const flowPromise = flowManager.createFlow(flowId, type);
|
|
|
|
// Increase delay to ensure flow is properly created
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
// Complete the flow
|
|
await flowManager.completeFlow(flowId, type, 'result1');
|
|
|
|
const result = await flowPromise;
|
|
expect(result).toBe('result1');
|
|
}, 15000);
|
|
|
|
it('should handle concurrent flow monitoring', async () => {
|
|
const flowId = 'test-flow';
|
|
const type = 'test-type';
|
|
|
|
// Create initial flow
|
|
const flowPromise = flowManager.createFlow(flowId, type);
|
|
|
|
// Increase delay
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
// Complete the flow
|
|
await flowManager.completeFlow(flowId, type, 'success');
|
|
|
|
const result = await flowPromise;
|
|
expect(result).toBe('success');
|
|
}, 15000);
|
|
|
|
it('should handle concurrent success and failure attempts', async () => {
|
|
const flowId = 'race-flow';
|
|
const type = 'test-type';
|
|
|
|
const flowPromise = flowManager.createFlow(flowId, type);
|
|
|
|
// Increase delay
|
|
await new Promise((resolve) => setTimeout(resolve, 500));
|
|
|
|
// Fail the flow
|
|
await flowManager.failFlow(flowId, type, new Error('failure'));
|
|
|
|
await expect(flowPromise).rejects.toThrow('failure');
|
|
}, 15000);
|
|
});
|
|
});
|