rework logout

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<void> {
+export async function logout(): Promise<void> {
 	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')
 }

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) {