From 54a5e73117b1bc3421cc5297d9b1c19f69bef0eb Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 30 Dec 2022 15:32:51 +0100
Subject: [PATCH] fix login redirection

---
 frontend/src/lib/logout.ts                                | 2 ++
 .../(root)/(logged)/user/(user)/workspaces/+page.svelte   | 8 ++------
 frontend/src/routes/(root)/+layout.svelte                 | 4 +++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lib/logout.ts b/frontend/src/lib/logout.ts
index 83726fd171..dee90456f9 100644
--- a/frontend/src/lib/logout.ts
+++ b/frontend/src/lib/logout.ts
@@ -4,6 +4,8 @@ import { clearStores } from './stores.js'
 import { sendUserToast } from './utils.js'
 
 export async function logoutWithRedirect(rd?: string): Promise<void> {
+	console.log('logoutWithRedirect', rd)
+
 	await clearUser()
 	if (rd && rd?.split('?')[0] != '/user/login') {
 		const error = document.cookie.includes('token')
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
index 96f7752f89..78b0c3a015 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/workspaces/+page.svelte
@@ -72,9 +72,7 @@
 
 <CenteredModal title="Select a workspace" subtitle="Logged in as {$usersWorkspaceStore?.email}">
 	<h2 class="mb-4 inline-flex gap-2"
-		>Workspaces{#if loading}<WindmillIcon
-				class="animate-[pulse_5s_linear_infinite] animate-[spin_5s_linear_infinite]"
-			/>
+		>Workspaces{#if loading}<WindmillIcon class="animate-[spin_5s_linear_infinite]" />
 		{/if}
 	</h2>
 
@@ -125,9 +123,7 @@
 
 	<h2 class="mt-6 mb-4">Invites to join a Workspace</h2>
 	{#if invites.length == 0}
-		<p class="text-sm text-gray-500 mt-2">
-			You don't have new invites at the moment.
-		</p>
+		<p class="text-sm text-gray-500 mt-2"> You don't have new invites at the moment. </p>
 	{/if}
 	{#each invites as invite}
 		<div
diff --git a/frontend/src/routes/(root)/+layout.svelte b/frontend/src/routes/(root)/+layout.svelte
index 341215981d..fbcc3ec425 100644
--- a/frontend/src/routes/(root)/+layout.svelte
+++ b/frontend/src/routes/(root)/+layout.svelte
@@ -45,7 +45,9 @@
 			}
 		} catch (e) {
 			console.error(e)
-			await logoutWithRedirect($page.url.pathname + $page.url.search)
+			if ($page.url.pathname != '/user/login') {
+				await logoutWithRedirect($page.url.pathname + $page.url.search)
+			}
 		}
 	}