From 1e616cf815f79d43ec30576217bc000e9969295c Mon Sep 17 00:00:00 2001
From: Alexandru-Dan Pop <alexandrudanpop@gmail.com>
Date: Wed, 26 Nov 2025 17:43:27 +0200
Subject: [PATCH 1/2] Add client id to frontegg app

---
 .../react-ui/src/app/lib/frontegg-setup.ts    | 29 ++++++++++++++++---
 .../cloud-connection-page.tsx                 |  2 +-
 .../cloud-connection/cloud-logout-page.tsx    |  2 +-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/packages/react-ui/src/app/lib/frontegg-setup.ts b/packages/react-ui/src/app/lib/frontegg-setup.ts
index 26be0a6d03..796905c798 100644
--- a/packages/react-ui/src/app/lib/frontegg-setup.ts
+++ b/packages/react-ui/src/app/lib/frontegg-setup.ts
@@ -5,17 +5,38 @@ export const additionalFronteggParams = {
   prompt: 'select_account',
 };
 
-export function initializeFrontegg(url: string, tenant?: string): FronteggApp {
-  const tenantResolver = tenant ? () => ({ tenant }) : undefined;
+let fronteggApp: FronteggApp | null = null;
+
+type Options = {
+  url: string;
+  clientId?: string;
+  tenant?: string;
+};
 
-  return initialize({
+export function initializeFrontegg({
+  url,
+  clientId,
+  tenant,
+}: Options): FronteggApp {
+  if (fronteggApp) {
+    return fronteggApp;
+  }
+  const tenantResolver = tenant ? () => ({ tenant }) : undefined;
+  const options = {
     contextOptions: {
       baseUrl: url,
+      clientId: clientId,
       tenantResolver,
     },
     authOptions: {
       keepSessionAlive: true,
     },
     hostedLoginBox: true,
-  });
+  };
+  fronteggApp = initialize(options);
+  return fronteggApp;
+}
+
+export function getFronteggApp(): FronteggApp | null {
+  return fronteggApp;
 }
diff --git a/packages/react-ui/src/app/routes/cloud-connection/cloud-connection-page.tsx b/packages/react-ui/src/app/routes/cloud-connection/cloud-connection-page.tsx
index 5669482ee9..e6ba30c38e 100644
--- a/packages/react-ui/src/app/routes/cloud-connection/cloud-connection-page.tsx
+++ b/packages/react-ui/src/app/routes/cloud-connection/cloud-connection-page.tsx
@@ -43,7 +43,7 @@ const CloudConnectionPage = () => {
       return;
     }
 
-    const app = initializeFrontegg(FRONTEGG_URL as string);
+    const app = initializeFrontegg({ url: FRONTEGG_URL as string });
 
     app.ready(() => {
       app.store.subscribe(() => {
diff --git a/packages/react-ui/src/app/routes/cloud-connection/cloud-logout-page.tsx b/packages/react-ui/src/app/routes/cloud-connection/cloud-logout-page.tsx
index 40ee6e4122..727a8e1850 100644
--- a/packages/react-ui/src/app/routes/cloud-connection/cloud-logout-page.tsx
+++ b/packages/react-ui/src/app/routes/cloud-connection/cloud-logout-page.tsx
@@ -37,7 +37,7 @@ const CloudLogoutPage = () => {
       return;
     }
 
-    const app = initializeFrontegg(FRONTEGG_URL as string);
+    const app = initializeFrontegg({ url: FRONTEGG_URL as string });
 
     Cookies.remove('cloud-token');
     Cookies.remove('cloud-refresh-token');

From 408a26651a65857ecf510c347d4558e1a99e0242 Mon Sep 17 00:00:00 2001
From: Alexandru-Dan Pop <alexandrudanpop@gmail.com>
Date: Wed, 26 Nov 2025 17:45:14 +0200
Subject: [PATCH 2/2] Update packages/react-ui/src/app/lib/frontegg-setup.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
---
 packages/react-ui/src/app/lib/frontegg-setup.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react-ui/src/app/lib/frontegg-setup.ts b/packages/react-ui/src/app/lib/frontegg-setup.ts
index 796905c798..2f0079f6c1 100644
--- a/packages/react-ui/src/app/lib/frontegg-setup.ts
+++ b/packages/react-ui/src/app/lib/frontegg-setup.ts
@@ -25,7 +25,7 @@ export function initializeFrontegg({
   const options = {
     contextOptions: {
       baseUrl: url,
-      clientId: clientId,
+      clientId,
       tenantResolver,
     },
     authOptions: {