From b8039be9587b1e450591245c31b7f25cf15abe58 Mon Sep 17 00:00:00 2001
From: Max Peintner <max@caos.ch>
Date: Mon, 28 Oct 2024 15:51:54 +0100
Subject: [PATCH] response mapping

---
 apps/login/src/app/(login)/register/page.tsx | 5 +++--
 apps/login/src/lib/zitadel.ts                | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/login/src/app/(login)/register/page.tsx b/apps/login/src/app/(login)/register/page.tsx
index cbea16432d3..931cad0e087 100644
--- a/apps/login/src/app/(login)/register/page.tsx
+++ b/apps/login/src/app/(login)/register/page.tsx
@@ -22,8 +22,9 @@ export default async function Page({
     searchParams;
 
   if (!organization) {
-    const org: Organization | void = await getDefaultOrg().catch((error) => {
-      console.log("getDefaultOrgError", error);
+    const org: Organization | null = await getDefaultOrg().catch((error) => {
+      console.warn(error);
+      return null;
     });
     if (!org) {
       console.warn("No default organization found");
diff --git a/apps/login/src/lib/zitadel.ts b/apps/login/src/lib/zitadel.ts
index 864d19ae25f..3eee677f1d0 100644
--- a/apps/login/src/lib/zitadel.ts
+++ b/apps/login/src/lib/zitadel.ts
@@ -21,6 +21,7 @@ import {
 import { create, fromJson, toJson } from "@zitadel/client";
 import { TextQueryMethod } from "@zitadel/proto/zitadel/object/v2/object_pb";
 import { CreateCallbackRequest } from "@zitadel/proto/zitadel/oidc/v2/oidc_service_pb";
+import { Organization } from "@zitadel/proto/zitadel/org/v2/org_pb";
 import { BrandingSettingsSchema } from "@zitadel/proto/zitadel/settings/v2/branding_settings_pb";
 import { LegalAndSupportSettingsSchema } from "@zitadel/proto/zitadel/settings/v2/legal_settings_pb";
 import {
@@ -417,7 +418,7 @@ export async function listUsers({
   return userService.listUsers({ queries: queries });
 }
 
-export async function getDefaultOrg() {
+export async function getDefaultOrg(): Promise<Organization | null> {
   return orgService
     .listOrganizations(
       {
@@ -432,7 +433,7 @@ export async function getDefaultOrg() {
       },
       {},
     )
-    .then((resp) => resp.result[0]);
+    .then((resp) => (resp?.result && resp.result[0] ? resp.result[0] : null));
 }
 
 export async function getOrgsByDomain(domain: string) {