Merge pull request #1138 from spotify/eide/fix-logout

Auth: fix logout()
This commit is contained in:
Marcus Eide
2020-06-04 13:04:39 +02:00
committed by GitHub
3 changed files with 8 additions and 4 deletions
@@ -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',
);
});
@@ -115,7 +115,7 @@ export class DefaultAuthConnector<AuthSession>
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<AuthSession>
'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;
}
}
@@ -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));
}