From ebea54996632cf9ba4e65f283cba42f206bc2bac Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 3 Jun 2022 20:52:14 +0200
Subject: [PATCH] fix login bug

---
 frontend/src/routes/__layout-root.svelte   | 19 +------------------
 frontend/src/routes/user/login@user.svelte | 12 +++++++++++-
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/frontend/src/routes/__layout-root.svelte b/frontend/src/routes/__layout-root.svelte
index e389acd002..3678ed90e2 100644
--- a/frontend/src/routes/__layout-root.svelte
+++ b/frontend/src/routes/__layout-root.svelte
@@ -31,15 +31,6 @@
 		'Connection got disposed.'
 	]
 
-	async function redirectIfLoggedIn(): Promise<void> {
-		try {
-			await UserService.getCurrentEmail()
-			goto('/')
-		} catch {
-			clearStores()
-		}
-	}
-
 	async function loadData() {
 		try {
 			$usersWorkspaceStore = await WorkspaceService.listUserWorkspaces()
@@ -57,16 +48,8 @@
 		}
 	}
 
-	async function handleRedirectionsAndLoadData() {
-		if ($page.url.pathname === '/user/login') {
-			redirectIfLoggedIn()
-		} else {
-			loadData()
-		}
-	}
-
 	onMount(() => {
-		handleRedirectionsAndLoadData()
+		loadData()
 
 		window.onunhandledrejection = (event: PromiseRejectionEvent) => {
 			event.preventDefault()
diff --git a/frontend/src/routes/user/login@user.svelte b/frontend/src/routes/user/login@user.svelte
index 386f15d857..2ef1a0ca6b 100644
--- a/frontend/src/routes/user/login@user.svelte
+++ b/frontend/src/routes/user/login@user.svelte
@@ -2,10 +2,11 @@
 	import { goto } from '$app/navigation'
 	import { page } from '$app/stores'
 	import { faGithub } from '@fortawesome/free-brands-svg-icons'
+	import { onMount } from 'svelte'
 	import Icon from 'svelte-awesome'
 	import { slide } from 'svelte/transition'
 	import { UserService, WorkspaceService } from '../../gen'
-	import { userStore, usersWorkspaceStore, workspaceStore } from '../../stores'
+	import { clearStores, userStore, usersWorkspaceStore, workspaceStore } from '../../stores'
 	import { getUser, refreshSuperadmin, sendUserToast } from '../../utils'
 	import CenteredModal from './CenteredModal.svelte'
 
@@ -42,6 +43,15 @@
 		}
 	}
 
+	onMount(async () => {
+		try {
+			await UserService.getCurrentEmail()
+			goto('/')
+		} catch {
+			clearStores()
+		}
+	})
+
 	function handleKeyUp(event: KeyboardEvent) {
 		const key = event.key || event.keyCode