mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-09-09 16:10:04 +00:00
After successful bridged refresh recovery, re-store the stale-cookie bridge with a short grace TTL instead of deleting it immediately. This lets parallel /api/auth/refresh requests that already sent the stale browser cookie recover before they can observe the first response's Set-Cookie. Retarget the bridge to the refresh token returned by the bridged retry so B-to-C refresh-token rotation remains recoverable. The grace TTL is parsed with math() and defaults to 60s, which shrinks the replay window from the original REFRESH_TOKEN_EXPIRY bridge lifetime to the short recovery grace period. Remove the now-unused explicit bridge delete path from the service and data-schemas method surface. Add regression coverage for grace re-store, identity symmetry, retry failure behavior, and same-key upsert replacement.
169 lines
5.2 KiB
JavaScript
169 lines
5.2 KiB
JavaScript
jest.mock('@librechat/data-schemas', () => ({
|
|
logger: {
|
|
error: jest.fn(),
|
|
debug: jest.fn(),
|
|
warn: jest.fn(),
|
|
info: jest.fn(),
|
|
},
|
|
DEFAULT_REFRESH_TOKEN_EXPIRY: 604800000,
|
|
encryptV2: jest.fn(async (value) => `encrypted:${value}`),
|
|
decryptV2: jest.fn(async (value) => value.replace(/^encrypted:/, '')),
|
|
}));
|
|
|
|
jest.mock('@librechat/api', () => ({
|
|
...jest.requireActual('@librechat/api'),
|
|
math: jest.fn((_value, fallback) => fallback),
|
|
}));
|
|
|
|
jest.mock('~/models', () => ({
|
|
upsertRefreshTokenBridge: jest.fn(),
|
|
findRefreshTokenBridge: jest.fn(),
|
|
}));
|
|
|
|
const { encryptV2, decryptV2 } = require('@librechat/data-schemas');
|
|
const { math } = require('@librechat/api');
|
|
const db = require('~/models');
|
|
const {
|
|
storeRefreshTokenBridge,
|
|
getRefreshTokenBridge,
|
|
__internals,
|
|
} = require('./RefreshTokenBridge');
|
|
|
|
describe('RefreshTokenBridge', () => {
|
|
beforeEach(() => {
|
|
jest.clearAllMocks();
|
|
db.upsertRefreshTokenBridge.mockResolvedValue({});
|
|
db.findRefreshTokenBridge.mockResolvedValue(null);
|
|
});
|
|
|
|
describe('storeRefreshTokenBridge', () => {
|
|
it('stores an encrypted Mongo bridge with required fields', async () => {
|
|
const before = Date.now();
|
|
|
|
await storeRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
newRefreshToken: 'rt-new',
|
|
userId: 'user-123',
|
|
});
|
|
|
|
expect(encryptV2).toHaveBeenCalledWith('rt-new');
|
|
expect(db.upsertRefreshTokenBridge).toHaveBeenCalledWith({
|
|
oldRefreshTokenHash: __internals.hashRefreshToken('rt-old'),
|
|
encryptedNewRefreshToken: 'encrypted:rt-new',
|
|
userId: 'user-123',
|
|
tenantId: undefined,
|
|
openidIssuer: undefined,
|
|
expiresAt: expect.any(Date),
|
|
});
|
|
const stored = db.upsertRefreshTokenBridge.mock.calls[0][0];
|
|
expect(JSON.stringify(stored)).not.toContain('"rt-new"');
|
|
expect(stored.expiresAt.getTime()).toBeGreaterThanOrEqual(before + 604800000 - 1000);
|
|
});
|
|
|
|
it('stores optional tenant and issuer context', async () => {
|
|
await storeRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
newRefreshToken: 'rt-new',
|
|
userId: ' user-123 ',
|
|
tenantId: ' tenant-1 ',
|
|
openidIssuer: 'https://issuer.example.com/.well-known/openid-configuration',
|
|
});
|
|
|
|
expect(db.upsertRefreshTokenBridge).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
userId: 'user-123',
|
|
tenantId: 'tenant-1',
|
|
openidIssuer: 'https://issuer.example.com',
|
|
}),
|
|
);
|
|
});
|
|
|
|
it('does not store a bridge without required fields', async () => {
|
|
await storeRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
userId: 'user-123',
|
|
});
|
|
|
|
expect(db.upsertRefreshTokenBridge).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it('honors an explicit ttl override', async () => {
|
|
const before = Date.now();
|
|
|
|
await storeRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
newRefreshToken: 'rt-new',
|
|
userId: 'user-123',
|
|
ttl: 1000,
|
|
});
|
|
|
|
const stored = db.upsertRefreshTokenBridge.mock.calls[0][0];
|
|
expect(stored.expiresAt.getTime()).toBeGreaterThanOrEqual(before + 1000);
|
|
expect(stored.expiresAt.getTime()).toBeLessThanOrEqual(Date.now() + 1000);
|
|
});
|
|
|
|
it('derives the default ttl from REFRESH_TOKEN_EXPIRY', async () => {
|
|
await storeRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
newRefreshToken: 'rt-new',
|
|
userId: 'user-123',
|
|
});
|
|
|
|
expect(math).toHaveBeenCalledWith(process.env.REFRESH_TOKEN_EXPIRY, 604800000);
|
|
});
|
|
});
|
|
|
|
describe('getRefreshTokenBridge', () => {
|
|
it('retrieves and decrypts a matching bridge', async () => {
|
|
db.findRefreshTokenBridge.mockResolvedValue({
|
|
encryptedNewRefreshToken: 'encrypted:rt-new',
|
|
userId: 'user-123',
|
|
tenantId: 'tenant-1',
|
|
openidIssuer: 'https://issuer.example.com',
|
|
createdAt: new Date(Date.now() - 100),
|
|
});
|
|
|
|
const result = await getRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
userId: ' user-123 ',
|
|
tenantId: ' tenant-1 ',
|
|
openidIssuer: 'https://issuer.example.com/.well-known/openid-configuration',
|
|
});
|
|
|
|
expect(db.findRefreshTokenBridge).toHaveBeenCalledWith({
|
|
oldRefreshTokenHash: __internals.hashRefreshToken('rt-old'),
|
|
userId: 'user-123',
|
|
tenantId: 'tenant-1',
|
|
});
|
|
expect(decryptV2).toHaveBeenCalledWith('encrypted:rt-new');
|
|
expect(result).toBe('rt-new');
|
|
});
|
|
|
|
it('returns null when bridge does not exist', async () => {
|
|
await expect(
|
|
getRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-nonexistent',
|
|
userId: 'user-123',
|
|
}),
|
|
).resolves.toBeNull();
|
|
});
|
|
|
|
it('returns null when stored issuer does not match', async () => {
|
|
db.findRefreshTokenBridge.mockResolvedValue({
|
|
encryptedNewRefreshToken: 'encrypted:rt-new',
|
|
userId: 'user-123',
|
|
openidIssuer: 'https://issuer1.example.com',
|
|
createdAt: new Date(),
|
|
});
|
|
|
|
const result = await getRefreshTokenBridge({
|
|
oldRefreshToken: 'rt-old',
|
|
userId: 'user-123',
|
|
openidIssuer: 'https://issuer2.example.com',
|
|
});
|
|
|
|
expect(result).toBeNull();
|
|
expect(decryptV2).not.toHaveBeenCalled();
|
|
});
|
|
});
|
|
});
|