From 93db0c97e8c8aea7b4a2795ef045ce2c49ad6527 Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Sat, 8 Nov 2025 17:30:22 +0100
Subject: [PATCH] chore: use hasSession to check if auth token exists

---
 apps/dashboard/src/lib/utils/functions/supabase.ts | 7 +++++++
 apps/dashboard/src/routes/+layout.svelte           | 8 +++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/dashboard/src/lib/utils/functions/supabase.ts b/apps/dashboard/src/lib/utils/functions/supabase.ts
index 1a697116..0fcd9f34 100644
--- a/apps/dashboard/src/lib/utils/functions/supabase.ts
+++ b/apps/dashboard/src/lib/utils/functions/supabase.ts
@@ -11,6 +11,13 @@ export const getSupabase = () => {
   return supabase;
 };
 
+export const hasSession = async () => {
+  const { data } = await getSupabase().auth.getSession();
+  console.log('has session', data);
+
+  return data.session !== null;
+};
+
 export const isSupabaseTokenInLocalStorage = () => {
   for (let i = 0; i < localStorage.length; i++) {
     const key = localStorage.key(i);
diff --git a/apps/dashboard/src/routes/+layout.svelte b/apps/dashboard/src/routes/+layout.svelte
index d8bef406..f041166f 100644
--- a/apps/dashboard/src/routes/+layout.svelte
+++ b/apps/dashboard/src/routes/+layout.svelte
@@ -30,7 +30,7 @@
   import { onMount } from 'svelte';
   import { MetaTags } from 'svelte-meta-tags';
   import isPublicRoute from '$lib/utils/functions/routes/isPublicRoute';
-  import { isSupabaseTokenInLocalStorage } from '$lib/utils/functions/supabase';
+  import { hasSession } from '$lib/utils/functions/supabase';
   import { goto } from '$app/navigation';
 
   import '../app.postcss';
@@ -69,12 +69,12 @@
 
     handleResize();
 
-    if (!isSupabaseTokenInLocalStorage() && !isPublicRoute($page.url?.pathname)) {
+    if (!hasSession() && !isPublicRoute($page.url?.pathname)) {
       console.log('No auth token and is not a public route, redirect to login', path);
       return goto('/login?redirect=/' + path);
     }
 
-    const { data: authListener } = supabase.auth.onAuthStateChange((event, session) => {
+    const { data: authListener } = supabase.auth.onAuthStateChange((event) => {
       // Log key events
       console.log(`event`, event);
 
@@ -101,7 +101,9 @@
       // }
     });
 
+    console.log('BEFORE === Setting currentOrg in layout', data.org, $currentOrg);
     if (data.isOrgSite && data.org && $currentOrg.siteName !== data.org.siteName) {
+      console.log('Setting currentOrg in layout');
       $globalStore.orgSiteName = data.orgSiteName;
       $globalStore.isOrgSite = data.isOrgSite;