From 36441d992799f33b868ab82a495bd53242c063cb Mon Sep 17 00:00:00 2001 From: blam Date: Thu, 5 May 2022 12:36:25 +0200 Subject: [PATCH] chore: fix the tests for node 14 Signed-off-by: blam --- plugins/scaffolder-backend/src/service/router.test.ts | 4 ---- plugins/scaffolder-backend/src/service/router.ts | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts index 30ea4d919e..14c543249e 100644 --- a/plugins/scaffolder-backend/src/service/router.test.ts +++ b/plugins/scaffolder-backend/src/service/router.test.ts @@ -233,8 +233,6 @@ describe('createRouter', () => { ), ); - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(broker).toHaveBeenCalledWith( expect.objectContaining({ createdBy: 'user:default/guest', @@ -285,8 +283,6 @@ describe('createRouter', () => { }, }); - await new Promise(resolve => setTimeout(resolve, 1000)); - expect(broker).toHaveBeenCalledWith( expect.objectContaining({ createdBy: undefined, diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts index 5a6690edab..5453dcd234 100644 --- a/plugins/scaffolder-backend/src/service/router.ts +++ b/plugins/scaffolder-backend/src/service/router.ts @@ -342,7 +342,9 @@ function parseBearerToken(header?: string): { if (!token) return {}; const [_header, rawPayload, _signature] = token.split('.'); - const payload: { sub: string } = JSON.parse(atob(rawPayload)); + const payload: { sub: string } = JSON.parse( + Buffer.from(rawPayload, 'base64').toString(), + ); return { entityRef: payload.sub,