From aae6e00b2f296587a7ccff122a5e798ffc242581 Mon Sep 17 00:00:00 2001
From: Rotimi Best <best@classroomio.com>
Date: Wed, 11 Mar 2026 17:15:07 +0100
Subject: [PATCH] feat: enhance signup logic by integrating organization data
 handling and improving conditional checks for signup restrictions

---
 .../src/routes/(auth)/signup/+page.svelte     | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/apps/dashboard/src/routes/(auth)/signup/+page.svelte b/apps/dashboard/src/routes/(auth)/signup/+page.svelte
index 1c8c6b50..f1995f7a 100644
--- a/apps/dashboard/src/routes/(auth)/signup/+page.svelte
+++ b/apps/dashboard/src/routes/(auth)/signup/+page.svelte
@@ -17,6 +17,7 @@
   import { goto } from '$app/navigation';
   import { resolve } from '$app/paths';
 
+  let { data } = $props();
   let fields = $state(Object.assign({}, SIGNUP_FIELDS));
   let loading = $state(false);
   let errors: {
@@ -30,22 +31,28 @@
   const redirectUrl = $derived(page.url.searchParams.get('redirect'));
   const inviteToken = $derived(page.url.searchParams.get('invite_token'));
 
+  // Use org from store or layout data (layout data ensures org is available on self-hosted before store is set)
+  const org = $derived($currentOrg?.id ? $currentOrg : (data.org ?? $currentOrg));
+
+  $effect(() => {
+    console.log('data', data);
+    console.log('org', org);
+  });
+
   // Invite context: allow signup when invite_token present or redirect contains invite info
   const hasInviteContext = $derived(
     !!inviteToken || (!!redirectUrl && (redirectUrl.includes('/invite/t/') || redirectUrl.includes('invite_token')))
   );
 
-  const inviteOnly = $derived(!!$currentOrg?.settings?.signup?.inviteOnly);
-  const signupRestricted = $derived(
-    $globalStore.isOrgSite && ($currentOrg.disableSignup || (inviteOnly && !hasInviteContext))
-  );
+  const inviteOnly = $derived(!!org?.settings?.signup?.inviteOnly);
+  const signupRestricted = $derived($globalStore.isOrgSite && (org.disableSignup || (inviteOnly && !hasInviteContext)));
 
   // Hide Google Auth if disabled for org
-  const hideGoogleAuth = $derived(!!($globalStore.isOrgSite && $currentOrg.disableGoogleAuth));
+  const hideGoogleAuth = $derived(!!($globalStore.isOrgSite && org.disableGoogleAuth));
 
   // Check if signup is disabled
   onMount(() => {
-    if ($globalStore.isOrgSite && $currentOrg.disableSignup) {
+    if ($globalStore.isOrgSite && org.disableSignup) {
       goto(resolve('/login?error=signup_disabled', {}));
     }
   });
@@ -68,6 +75,9 @@
       loading = true;
       const name = fields.email.split('@')[0];
 
+      // Use org from store or layout data; required for self-hosted when orgs exist
+      const orgId = org?.id;
+
       const { error } = await authClient.signUp.email(
         {
           email: fields.email,
@@ -76,7 +86,7 @@
         },
         {
           fetchOptions: {
-            headers: $globalStore.isOrgSite && $currentOrg?.id ? { 'cio-org-id': $currentOrg.id } : {}
+            headers: { 'cio-org-id': orgId }
           },
           onSuccess: (ctx) => {
             console.log('Signup successful');
@@ -135,7 +145,7 @@
       {$t('login.signup_disabled.title')}
     </h2>
     <p class="ui:mt-2 ui:text-sm ui:text-amber-700 ui:dark:text-amber-300">
-      {$currentOrg.disableSignupMessage ||
+      {org.disableSignupMessage ||
         (inviteOnly
           ? $t('login.signup_disabled.invite_only_message')
           : $t('settings.auth.login.signup_disabled_error'))}