From d834bf6f485e13ff996c3dcc4315048548649b7d Mon Sep 17 00:00:00 2001 From: Convly Date: Thu, 25 Aug 2022 16:27:18 +0200 Subject: [PATCH] Fix tests --- .../server/strategies/__tests__/api-token.test.js | 10 ++++++---- packages/core/admin/server/strategies/api-token.js | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/core/admin/server/strategies/__tests__/api-token.test.js b/packages/core/admin/server/strategies/__tests__/api-token.test.js index 2a851b9d12..d088ad6362 100644 --- a/packages/core/admin/server/strategies/__tests__/api-token.test.js +++ b/packages/core/admin/server/strategies/__tests__/api-token.test.js @@ -86,7 +86,7 @@ describe('API Token Auth Strategy', () => { }); test('Expired token throws on authorize', async () => { - const pastDate = Date.now() - 1; + const pastDate = new Date(Date.now() - 1).toISOString(); const getBy = jest.fn(() => { return { @@ -109,9 +109,11 @@ describe('API Token Auth Strategy', () => { }, }; - expect(async () => { - await apiTokenStrategy.authenticate(ctx); - }).rejects.toThrow(new UnauthorizedError('Token expired')); + const { authenticated, error } = await apiTokenStrategy.authenticate(ctx); + + expect(authenticated).toBe(false); + expect(error).toBeInstanceOf(UnauthorizedError); + expect(error.message).toBe('Token expired'); expect(getBy).toHaveBeenCalledWith({ accessKey: 'api-token_tests-hashed-access-key' }); }); diff --git a/packages/core/admin/server/strategies/api-token.js b/packages/core/admin/server/strategies/api-token.js index 8d6cf7a375..363447203f 100644 --- a/packages/core/admin/server/strategies/api-token.js +++ b/packages/core/admin/server/strategies/api-token.js @@ -47,7 +47,7 @@ const authenticate = async (ctx) => { // token has expired if (expirationDate < currentDate) { - throw new UnauthorizedError('Token expired'); + return { authenticated: false, error: new UnauthorizedError('Token expired') }; } // update lastUsedAt