From 4e1e80e673f29d6ab4768bde80cc10be5932282d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 27 Dec 2022 13:38:34 +0100
Subject: [PATCH] nit redirect on logout

---
 frontend/src/lib/logout.ts                                  | 2 +-
 .../routes/(root)/(logged)/user/(user)/logout/+page.svelte  | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/lib/logout.ts b/frontend/src/lib/logout.ts
index 732c1da44b..83726fd171 100644
--- a/frontend/src/lib/logout.ts
+++ b/frontend/src/lib/logout.ts
@@ -21,7 +21,7 @@ export async function logout(): Promise<void> {
 	sendUserToast('you have been logged out')
 }
 
-async function clearUser() {
+export async function clearUser() {
 	try {
 		clearStores()
 		await UserService.logout()
diff --git a/frontend/src/routes/(root)/(logged)/user/(user)/logout/+page.svelte b/frontend/src/routes/(root)/(logged)/user/(user)/logout/+page.svelte
index d7a65cd9b9..fa7fd9ab7b 100644
--- a/frontend/src/routes/(root)/(logged)/user/(user)/logout/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/user/(user)/logout/+page.svelte
@@ -1,14 +1,16 @@
 <script lang="ts">
+	import { goto } from '$app/navigation'
 	import { page } from '$app/stores'
 	import CenteredModal from '$lib/components/CenteredModal.svelte'
 	import WindmillIcon from '$lib/components/icons/WindmillIcon.svelte'
-	import { logoutWithRedirect } from '$lib/logout'
+	import { clearUser, logoutWithRedirect } from '$lib/logout'
 	import { onMount } from 'svelte'
 
 	const rd = $page.url.searchParams.get('rd')
 
 	onMount(async () => {
-		await logoutWithRedirect(rd ?? undefined)
+		await clearUser()
+		goto(rd ?? '/user/login')
 	})
 </script>