From eef1728a1867f7a98fb6ba12a79e0a44a31103a6 Mon Sep 17 00:00:00 2001
From: Max Peintner <max@caos.ch>
Date: Tue, 12 Nov 2024 16:54:42 +0100
Subject: [PATCH] cleanup def loading

---
 apps/login/src/app/(login)/loginname/page.tsx | 9 ++-------
 apps/login/src/app/(login)/password/page.tsx  | 9 ++-------
 apps/login/src/app/(login)/register/page.tsx  | 9 ++-------
 3 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/apps/login/src/app/(login)/loginname/page.tsx b/apps/login/src/app/(login)/loginname/page.tsx
index b6341a523db..68928755d33 100644
--- a/apps/login/src/app/(login)/loginname/page.tsx
+++ b/apps/login/src/app/(login)/loginname/page.tsx
@@ -34,13 +34,8 @@ export default async function Page({
 
   let defaultOrganization;
   if (!organization) {
-    const org: Organization | null = await getDefaultOrg().catch((error) => {
-      console.warn(error);
-      return null;
-    });
-    if (!org) {
-      console.warn("No default organization found");
-    } else {
+    const org: Organization | null = await getDefaultOrg();
+    if (org) {
       defaultOrganization = org.id;
     }
   }
diff --git a/apps/login/src/app/(login)/password/page.tsx b/apps/login/src/app/(login)/password/page.tsx
index 222571854ab..659488043bc 100644
--- a/apps/login/src/app/(login)/password/page.tsx
+++ b/apps/login/src/app/(login)/password/page.tsx
@@ -25,13 +25,8 @@ export default async function Page({
 
   let defaultOrganization;
   if (!organization) {
-    const org: Organization | null = await getDefaultOrg().catch((error) => {
-      console.warn(error);
-      return null;
-    });
-    if (!org) {
-      console.warn("No default organization found");
-    } else {
+    const org: Organization | null = await getDefaultOrg();
+    if (org) {
       defaultOrganization = org.id;
     }
   }
diff --git a/apps/login/src/app/(login)/register/page.tsx b/apps/login/src/app/(login)/register/page.tsx
index 931cad0e087..f23582ae3f7 100644
--- a/apps/login/src/app/(login)/register/page.tsx
+++ b/apps/login/src/app/(login)/register/page.tsx
@@ -22,13 +22,8 @@ export default async function Page({
     searchParams;
 
   if (!organization) {
-    const org: Organization | null = await getDefaultOrg().catch((error) => {
-      console.warn(error);
-      return null;
-    });
-    if (!org) {
-      console.warn("No default organization found");
-    } else {
+    const org: Organization | null = await getDefaultOrg();
+    if (org) {
       organization = org.id;
     }
   }