Welp, try another fix

Author: hhvrc

src/routes/(anonymous)/+layout.ts

@@ -13,8 +13,11 @@ export const prerender = true;
 export function load() {
   if (!browser) return; // Just to be safe that the code below definetly runs in browser
 
+  console.log('(anonymous)/+layout.ts (browser) - entry');
+
   // On loading in the anonymous section, check if cookie is set, if it is send us to the authenticated section
   if (get(IsAuthenticated)) {
+    console.log('(anonymous)/+layout.ts (browser) - redirect');
     goto('/home');
   }
 

src/routes/(authenticated)/+layout.ts

@@ -11,8 +11,11 @@ export const prerender = false;
 export function load({ url }) {
   if (!browser) return; // Yeah please dont run on server
 
+  console.log('(anonymous)/+layout.ts (browser) - entry');
+
   // On loading in the anonymous section, check if cookie is set, if it is send us to the authenticated section
   if (!get(IsAuthenticated)) {
+    console.log('(anonymous)/+layout.ts (browser) - redirect');
     goto(`/login?redirect=${url.pathname}`);
   }
 };

src/routes/+layout.ts

@@ -1,33 +1,58 @@
 import { browser } from '$app/environment';
+import { goto } from '$app/navigation';
+import { accountV1Api } from '$lib/api/index.js';
 import { initializeSignalR } from '$lib/signalr';
 import { IsAuthenticated } from '$lib/stores/AuthenticatedStore';
 import { initializeDarkModeStore } from '$lib/stores/ColorSchemeStore.js';
 import { initializeFlashManagersStore } from '$lib/stores/FlashManagersStore.js';
 import { initializeSerialPortsStore } from '$lib/stores/SerialPortsStore.js';
-import { initializeUserStore } from '$lib/stores/UserStore.js';
+import { initializeUserStore, UserStore } from '$lib/stores/UserStore.js';
 import { get } from 'svelte/store';
 
 // Set the default for the application
 export const ssr = false; // Only this file and pages under it in browser
 export const prerender = true;
 
-export function load({ data }) {
+export async function load({ data, url }) {
   if (!browser) return; // Be completely sure this only runs in browser
 
+  console.log('+layout.ts (browser) - entry');
+
+  if (url.pathname === '/logout') {
+    console.log('+layout.ts (browser) - logout');
+
+    // Clear local store
+    UserStore.reset();
+
+    // Clear cookie and server state
+    try {
+      await accountV1Api.accountLogout();
+    } catch {
+      // Do nothing
+    }
+
+    // Go to landing page
+    goto('/');
+    return;
+  }
+
   const wasAuthenticated = get(IsAuthenticated);
   if (wasAuthenticated !== data.isAuthenticated) {
+    console.log('+layout.ts (browser) - initialize');
     // Set authentication state
     IsAuthenticated.set(data.isAuthenticated);
 
     // First time init
     if (wasAuthenticated === undefined) {
+      console.log('+layout.ts (browser) - initialize first time');
       initializeDarkModeStore();
       initializeFlashManagersStore();
       initializeSerialPortsStore();
     }
 
     // Init on getting authenticated
     if (data.isAuthenticated) {
+      console.log('+layout.ts (browser) - initialize auth');
       initializeUserStore();
       initializeSignalR();
     }