From b0435ada43583a30c0b635b60420ca8eb388c87a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 7 Aug 2022 12:17:04 +0200
Subject: [PATCH] fix redirect at login

---
 frontend/src/lib/logout.ts                 | 4 +---
 frontend/src/routes/user/login@user.svelte | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/logout.ts b/frontend/src/lib/logout.ts
index 0bbfd61944..214ab79fd9 100644
--- a/frontend/src/lib/logout.ts
+++ b/frontend/src/lib/logout.ts
@@ -1,7 +1,5 @@
 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'
 
@@ -9,7 +7,7 @@ function clearCookies() {
 	document.cookie.split(";").forEach(function (c) { document.cookie = c.replace(/^ +/, "").replace(/=.*/, "=;expires=" + new Date().toUTCString() + ";path=/") })
 }
 export function logoutWithRedirect(rd?: string): void {
-	if (get(page).url.pathname != '/user/login') {
+	if (rd?.split('?')[0] != '/user/login') {
 		const error = document.cookie.includes('token')
 			? `error=${encodeURIComponent('You have been logged out because your session has expired.')}&`
 			: ''
diff --git a/frontend/src/routes/user/login@user.svelte b/frontend/src/routes/user/login@user.svelte
index a347577b8e..2d5bb819e3 100644
--- a/frontend/src/routes/user/login@user.svelte
+++ b/frontend/src/routes/user/login@user.svelte
@@ -51,7 +51,7 @@
 		if ($workspaceStore) {
 			goto(rd ?? '/')
 		} else {
-			goto('/user/workspaces')
+			goto(`/user/workspaces${rd ? `?rd=${encodeURIComponent(rd)}` : ''}`)
 		}
 	}