From ebbb1dcce3289329a2c2d7fa242dc51126cbd86b Mon Sep 17 00:00:00 2001
From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date: Thu, 25 Apr 2024 16:51:03 +0300
Subject: [PATCH] fix: oAuthClient Creation Form (#14750)

---
 .../organizations/platform/oauth-clients/OAuthClientForm.tsx   | 3 ++-
 .../organizations/platform/oauth-clients/useOAuthClients.ts    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/web/components/settings/organizations/platform/oauth-clients/OAuthClientForm.tsx b/apps/web/components/settings/organizations/platform/oauth-clients/OAuthClientForm.tsx
index 7225896d9d..119c66805a 100644
--- a/apps/web/components/settings/organizations/platform/oauth-clients/OAuthClientForm.tsx
+++ b/apps/web/components/settings/organizations/platform/oauth-clients/OAuthClientForm.tsx
@@ -71,10 +71,11 @@ export const OAuthClientForm: FC<{ clientId?: string }> = ({ clientId }) => {
       data.bookingRescheduleRedirectUri &&
         setValue("bookingRescheduleRedirectUri", data.bookingRescheduleRedirectUri);
       setValue("areEmailsEnabled", data?.areEmailsEnabled);
-      data?.redirectUris.forEach((uri: string, index: number) => {
+      data.redirectUris?.forEach?.((uri: string, index: number) => {
         index === 0 && setValue(`redirectUris.${index}.uri`, uri);
         index !== 0 && append({ uri });
       });
+      if (!data.permissions) return;
       if (hasAppsReadPermission(data.permissions)) setValue("appsRead", true);
       if (hasAppsWritePermission(data.permissions)) setValue("appsWrite", true);
       if (hasBookingReadPermission(data.permissions)) setValue("bookingRead", true);
diff --git a/apps/web/lib/hooks/settings/organizations/platform/oauth-clients/useOAuthClients.ts b/apps/web/lib/hooks/settings/organizations/platform/oauth-clients/useOAuthClients.ts
index 0ef3758e2b..bef11e9342 100644
--- a/apps/web/lib/hooks/settings/organizations/platform/oauth-clients/useOAuthClients.ts
+++ b/apps/web/lib/hooks/settings/organizations/platform/oauth-clients/useOAuthClients.ts
@@ -36,7 +36,7 @@ export const useOAuthClient = (clientId?: string) => {
         headers: { "Content-type": "application/json" },
       }).then((res) => res.json());
     },
-    enabled: clientId !== undefined,
+    enabled: Boolean(clientId),
     staleTime: Infinity,
   });