From e0b9bf5f8f2caecaddd63f313a83cbadac2bd8d3 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 7 Aug 2022 11:42:43 +0200 Subject: [PATCH] rework logout --- frontend/src/lib/logout.ts | 8 ++++---- frontend/src/routes/__layout-root@none.svelte | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/lib/logout.ts b/frontend/src/lib/logout.ts index 20a9aff611..db714b66ea 100644 --- a/frontend/src/lib/logout.ts +++ b/frontend/src/lib/logout.ts @@ -14,15 +14,15 @@ export function logoutWithRedirect(rd?: string): void { goto(`/user/login?${error}${rd ? 'rd=' + encodeURIComponent(rd) : ''}`) } -export async function logout(logoutMessage?: string): Promise { +export async function logout(): Promise { try { clearStores() await UserService.logout() clearCookies() - goto(`/user/login${logoutMessage ? '?error=' + encodeURIComponent(logoutMessage) : ''}`) - sendUserToast('you have been logged out') } catch (error) { - goto('/user/login') console.error(error) + clearCookies() } + goto(`/user/login`) + sendUserToast('you have been logged out') } diff --git a/frontend/src/routes/__layout-root@none.svelte b/frontend/src/routes/__layout-root@none.svelte index 89230a19fe..db9c248e91 100644 --- a/frontend/src/routes/__layout-root@none.svelte +++ b/frontend/src/routes/__layout-root@none.svelte @@ -83,9 +83,9 @@ } if (status == '401') { - if ($page.url.pathname != '/user/login') { - sendUserToast('Logged out after a request was unauthorized', true) - logout($page.url.pathname) + const pathName = $page.url.pathname + if (pathName != '/user/login') { + logoutWithRedirect(pathName + $page.url.search) } } else { if (body) {