From a217153d31dff7382a20da6df2152ea376e4ffd7 Mon Sep 17 00:00:00 2001
From: ernstmul <ernst.mulders@gmail.com>
Date: Thu, 14 Nov 2024 09:44:30 +0100
Subject: [PATCH] Unify logout function over different places

---
 src/lib/helpers/logout.ts                         | 12 ++++++++++++
 src/lib/layout/header.svelte                      | 15 ++++-----------
 src/routes/(console)/account/header.svelte        | 10 +---------
 .../deleteMember.svelte                           |  7 +++----
 4 files changed, 20 insertions(+), 24 deletions(-)
 create mode 100644 src/lib/helpers/logout.ts

diff --git a/src/lib/helpers/logout.ts b/src/lib/helpers/logout.ts
new file mode 100644
index 000000000..446f451cb
--- /dev/null
+++ b/src/lib/helpers/logout.ts
@@ -0,0 +1,12 @@
+import { sdk } from '$lib/stores/sdk';
+import { goto, invalidate } from '$app/navigation';
+import { Dependencies } from '$lib/constants';
+import { Submit, trackEvent } from '$lib/actions/analytics';
+import { base } from '$app/paths';
+
+export async function logout() {
+    await sdk.forConsole.account.deleteSession('current');
+    await invalidate(Dependencies.ACCOUNT);
+    trackEvent(Submit.AccountLogout);
+    await goto(`${base}/login`);
+}
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index a63a57818..390cad41b 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -1,12 +1,12 @@
 <script lang="ts">
-    import { goto, invalidate } from '$app/navigation';
+    import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { AvatarInitials, DropList, DropListItem, DropListLink, Support } from '$lib/components';
     import { app } from '$lib/stores/app';
     import { user } from '$lib/stores/user';
     import { organizationList, organization, newOrgModal } from '$lib/stores/organization';
     import { page } from '$app/stores';
-    import { Submit, trackEvent } from '$lib/actions/analytics';
+    import { trackEvent } from '$lib/actions/analytics';
     import { tooltip } from '$lib/actions/tooltip';
     import { toggleCommandCenter } from '$lib/commandCenter/commandCenter.svelte';
     import Button from '$lib/elements/forms/button.svelte';
@@ -18,10 +18,10 @@
     import SystemMode from '$lib/images/mode/system-mode.svg';
     import { feedback } from '$lib/stores/feedback';
     import { slide } from 'svelte/transition';
-    import { sdk } from '$lib/stores/sdk';
     import { isCloud } from '$lib/system';
     import { Feedback } from '$lib/components/feedback';
-    import { BillingPlan, Dependencies } from '$lib/constants';
+    import { BillingPlan } from '$lib/constants';
+    import { logout } from '$lib/helpers/logout';
     import { upgradeURL } from '$lib/stores/billing';
 
     let showDropdown = false;
@@ -36,13 +36,6 @@
         }
     }
 
-    async function logout() {
-        await sdk.forConsole.account.deleteSession('current');
-        await invalidate(Dependencies.ACCOUNT);
-        trackEvent(Submit.AccountLogout);
-        await goto(`${base}/login`);
-    }
-
     function onBlur(event: MouseEvent) {
         if (
             showDropdown &&
diff --git a/src/routes/(console)/account/header.svelte b/src/routes/(console)/account/header.svelte
index 9929edf57..86adaa5bd 100644
--- a/src/routes/(console)/account/header.svelte
+++ b/src/routes/(console)/account/header.svelte
@@ -1,13 +1,11 @@
 <script lang="ts">
-    import { goto } from '$app/navigation';
     import { base } from '$app/paths';
     import { page } from '$app/stores';
-    import { Submit, trackEvent } from '$lib/actions/analytics';
     import { Tab, Tabs } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
-    import { sdk } from '$lib/stores/sdk';
+    import { logout } from '$lib/helpers/logout';
     import { user } from '$lib/stores/user';
     import { isCloud } from '$lib/system';
 
@@ -49,12 +47,6 @@
               }
           ]
         : permanentTabs;
-
-    async function logout() {
-        await sdk.forConsole.account.deleteSession('current');
-        trackEvent(Submit.AccountLogout);
-        await goto(`${base}/login`);
-    }
 </script>
 
 <Cover>
diff --git a/src/routes/(console)/organization-[organization]/deleteMember.svelte b/src/routes/(console)/organization-[organization]/deleteMember.svelte
index 5a6cd2687..d79b6bd01 100644
--- a/src/routes/(console)/organization-[organization]/deleteMember.svelte
+++ b/src/routes/(console)/organization-[organization]/deleteMember.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
-    import { base } from '$app/paths';
-    import { goto, invalidate } from '$app/navigation';
+    import { invalidate } from '$app/navigation';
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
@@ -13,6 +12,7 @@
     import { checkForUsageLimit } from '$lib/stores/billing';
     import { isCloud } from '$lib/system';
     import { organization } from '$lib/stores/organization';
+    import { logout } from '$lib/helpers/logout';
 
     const dispatch = createEventDispatcher();
 
@@ -24,8 +24,7 @@
             await sdk.forConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id);
 
             if (isUser) {
-                await sdk.forConsole.account.deleteSession('current');
-                await goto(`${base}/login`);
+                logout();
             } else {
                 dispatch('deleted');
             }