From f07d5425b93b20a3bea0e590e82f51032e8b82a7 Mon Sep 17 00:00:00 2001
From: Nate Kelley <nate@buster.so>
Date: Thu, 23 Jan 2025 09:29:07 -0700
Subject: [PATCH] user organization can be null

---
 web/src/api/buster_rest/users/interfaces.ts  | 2 +-
 web/src/app/app/layout.tsx                   | 2 +-
 web/src/context/Users/UserConfigProvider.tsx | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/src/api/buster_rest/users/interfaces.ts b/web/src/api/buster_rest/users/interfaces.ts
index 49992eb35..bc2ead3d1 100644
--- a/web/src/api/buster_rest/users/interfaces.ts
+++ b/web/src/api/buster_rest/users/interfaces.ts
@@ -67,7 +67,7 @@ export interface BusterUser {
 export interface BusterUserResponse {
   user: BusterUser;
   teams: BusterUserTeam[];
-  organizations: BusterOrganization[];
+  organizations: BusterOrganization[] | null;
 }
 
 export interface BusterOrganization {
diff --git a/web/src/app/app/layout.tsx b/web/src/app/app/layout.tsx
index 71e905aca..01ff37edf 100644
--- a/web/src/app/app/layout.tsx
+++ b/web/src/app/app/layout.tsx
@@ -26,7 +26,7 @@ export default async function Layout({
   const newUserRoute = createBusterRoute({ route: BusterAppRoutes.NEW_USER });
 
   if (
-    (!userInfo?.organizations[0]?.id || !userInfo?.user?.name) &&
+    (!userInfo?.organizations?.[0]?.id || !userInfo?.user?.name) &&
     !cookiePathname?.includes(newUserRoute) &&
     pathname !== newUserRoute &&
     supabaseContext.accessToken //added to avoid bug with anon user
diff --git a/web/src/context/Users/UserConfigProvider.tsx b/web/src/context/Users/UserConfigProvider.tsx
index 36c107431..5a0bfe362 100644
--- a/web/src/context/Users/UserConfigProvider.tsx
+++ b/web/src/context/Users/UserConfigProvider.tsx
@@ -26,7 +26,7 @@ export const useUserConfigProvider = ({ userInfo }: { userInfo: BusterUserRespon
 
   const user = userResponse?.user;
   const userTeams = userResponse?.teams || [];
-  const userOrganizations = userResponse?.organizations[0];
+  const userOrganizations = userResponse?.organizations?.[0];
   const userRole = userOrganizations?.role;
   const isUserRegistered =
     !!userResponse && !!userResponse?.organizations?.[0]?.id && !!userResponse?.user?.name;