From b32441f89b50bb37619f9f73842b071dc2ac6715 Mon Sep 17 00:00:00 2001 From: Marcus Eide Date: Thu, 4 Jun 2020 11:07:46 +0200 Subject: [PATCH 1/3] Use post for logout --- plugins/auth-backend/src/providers/factories.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/auth-backend/src/providers/factories.ts b/plugins/auth-backend/src/providers/factories.ts index f7560174ef..8576e36096 100644 --- a/plugins/auth-backend/src/providers/factories.ts +++ b/plugins/auth-backend/src/providers/factories.ts @@ -42,7 +42,7 @@ export const createAuthProviderRouter = (config: AuthProviderConfig) => { router.get('/start', provider.start.bind(provider)); router.get('/handler/frame', provider.frameHandler.bind(provider)); router.post('/handler/frame', provider.frameHandler.bind(provider)); - router.get('/logout', provider.logout.bind(provider)); + router.post('/logout', provider.logout.bind(provider)); if (provider.refresh) { router.get('/refresh', provider.refresh.bind(provider)); } From c0f3bb179bffd9917c3e443a264fbe560e9c1a39 Mon Sep 17 00:00:00 2001 From: Marcus Eide Date: Thu, 4 Jun 2020 11:19:36 +0200 Subject: [PATCH 2/3] Small changes in error handling for similarity --- .../src/lib/AuthConnector/DefaultAuthConnector.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.ts b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.ts index 21d2530c5a..f0f57c1c12 100644 --- a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.ts +++ b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.ts @@ -115,7 +115,7 @@ export class DefaultAuthConnector if (!res.ok) { const error: any = new Error( - `Auth refresh request failed with status ${res.statusText}`, + `Auth refresh request failed, ${res.statusText}`, ); error.status = res.status; throw error; @@ -140,10 +140,14 @@ export class DefaultAuthConnector 'x-requested-with': 'XMLHttpRequest', }, credentials: 'include', + }).catch(error => { + throw new Error(`Logout request failed, ${error}`); }); if (!res.ok) { - throw new Error(`Logout request failed with status ${res.status}`); + const error: any = new Error(`Logout request failed, ${res.statusText}`); + error.status = res.status; + throw error; } } From 532742227e6ea65ba4d707b3d4a1de5805f766ae Mon Sep 17 00:00:00 2001 From: Marcus Eide Date: Thu, 4 Jun 2020 11:29:46 +0200 Subject: [PATCH 3/3] Fix test --- .../core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts index 3d8f7abeb9..bfbb2dbc0b 100644 --- a/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts +++ b/packages/core-api/src/lib/AuthConnector/DefaultAuthConnector.test.ts @@ -76,7 +76,7 @@ describe('DefaultAuthConnector', () => { const helper = new DefaultAuthConnector(defaultOptions); await expect(helper.refreshSession()).rejects.toThrow( - 'Auth refresh request failed with status NOPE', + 'Auth refresh request failed, NOPE', ); });