rework logout

This commit is contained in:
Ruben Fiszel
2022-08-07 11:45:15 +02:00
parent e0b9bf5f8f
commit 87c953a2e4
+9 -5
View File
@@ -1,5 +1,7 @@
import { goto } from '$app/navigation'
import { page } from '$app/stores'
import { UserService } from '$lib/gen'
import { get } from 'svelte/store'
import { clearStores } from './stores.js'
import { sendUserToast } from './utils.js'
@@ -7,11 +9,13 @@ function clearCookies() {
document.cookie.split(";").forEach(function (c) { document.cookie = c.replace(/^ +/, "").replace(/=.*/, "=;expires=" + new Date().toUTCString() + ";path=/") })
}
export function logoutWithRedirect(rd?: string): void {
const error = document.cookie.includes('token')
? `error=${encodeURIComponent('You have been logged out because your session has expired.')}&`
: ''
clearCookies()
goto(`/user/login?${error}${rd ? 'rd=' + encodeURIComponent(rd) : ''}`)
if (get(page).url.pathname != '/user/login') {
const error = document.cookie.includes('token')
? `error=${encodeURIComponent('You have been logged out because your session has expired.')}&`
: ''
clearCookies()
goto(`/user/login?${error}${rd ? 'rd=' + encodeURIComponent(rd) : ''}`)
}
}
export async function logout(): Promise<void> {