From f60809a249a6a8fae310492b3fcdbb8087e51bef Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Wed, 10 Sep 2025 17:18:01 +0100
Subject: [PATCH] fix: only redirect in layout only if on redirect page

---
 apps/dashboard/src/lib/utils/functions/appSetup.ts     | 8 +-------
 apps/dashboard/src/routes/invite/s/[hash]/+page.svelte | 8 ++------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/apps/dashboard/src/lib/utils/functions/appSetup.ts b/apps/dashboard/src/lib/utils/functions/appSetup.ts
index 4aaebaf2..79ebf4fc 100644
--- a/apps/dashboard/src/lib/utils/functions/appSetup.ts
+++ b/apps/dashboard/src/lib/utils/functions/appSetup.ts
@@ -112,7 +112,6 @@ export async function getProfile({
 
     // Profile created, go to onboarding or lms
     if (!error && newProfileData) {
-      console.log('newProfileData', newProfileData);
       user.update((_user) => ({
         ..._user,
         fetchingUser: false,
@@ -128,7 +127,6 @@ export async function getProfile({
       handleLocaleChange(newProfileData[0].locale);
 
       if (isOrgSite) {
-        console.log('isOrgSite', isOrgSite);
         const { data, error } = await supabase
           .from('organizationmember')
           .insert({
@@ -137,8 +135,6 @@ export async function getProfile({
             role_id: 3
           })
           .select();
-        console.log('data', data);
-        console.log('error', error);
         if (error) {
           console.error('Error adding user to organisation', error);
         } else {
@@ -152,10 +148,8 @@ export async function getProfile({
         }
 
         if (params.get('redirect')) {
-          console.log('redirect', params.get('redirect'));
           goto(params.get('redirect') || '');
-        } else {
-          console.log('redirect', '/lms');
+        } else if (shouldRedirectOnAuth(path)) {
           goto('/lms');
         }
         return;
diff --git a/apps/dashboard/src/routes/invite/s/[hash]/+page.svelte b/apps/dashboard/src/routes/invite/s/[hash]/+page.svelte
index a89d12aa..7f8f56fe 100644
--- a/apps/dashboard/src/routes/invite/s/[hash]/+page.svelte
+++ b/apps/dashboard/src/routes/invite/s/[hash]/+page.svelte
@@ -112,10 +112,6 @@
     });
   }
 
-  $: console.log('data', data);
-  $: console.log('currentOrg', $currentOrg);
-  $: console.log('profile', $profile);
-
   function setCurOrg(cOrg: CurrentOrg) {
     if (!cOrg) return;
     currentOrg.set(cOrg);
@@ -136,7 +132,7 @@
   {supabase}
   isLogin={false}
   {handleSubmit}
-  isLoading={loading}
+  isLoading={loading || !$profile.id}
   showOnlyContent={true}
   showLogo={true}
   bind:formRef
@@ -151,7 +147,7 @@
       label="Join Course"
       type="submit"
       isDisabled={disableSubmit || loading}
-      isLoading={loading}
+      isLoading={loading || !$profile.id}
     />
   </div>
 </AuthUI>