Merge pull request #281 from rupato-deriv/Rupato/Fix-oidc-isclient-po…

…pulated-check fix: added isclient check
deriv-com · Feb 18, 2025 · dc97ffc · dc97ffc
2 parents 7be367c + 602ab80
commit dc97ffc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx
@@ -21,6 +21,9 @@ const Layout = () => {
     const checkClientAccount = JSON.parse(localStorage.getItem('clientAccounts') ?? '{}');
     const getQueryParams = new URLSearchParams(window.location.search);
     const currency = getQueryParams.get('account') ?? '';
+    const clientAccounts = JSON.parse(localStorage.getItem('accountsList') ?? '{}');
+    const isClientAccountsPopulated = Object.keys(clientAccounts).length > 0;
+
     const ifClientAccountHasCurrency =
         Object.values(checkClientAccount).some(account => account.currency === currency) || currency === 'demo';
 
@@ -31,13 +34,12 @@ const Layout = () => {
     });
 
     useEffect(() => {
-        if (isLoggedInCookie && isOAuth2Enabled && !isEndpointPage && !isCallbackPage) {
-            console.log('requestOidcAuthentication');
+        if (isLoggedInCookie && !isClientAccountsPopulated && isOAuth2Enabled && !isEndpointPage && !isCallbackPage) {
             requestOidcAuthentication({
                 redirectCallbackUri: `${window.location.origin}/callback`,
             });
         }
-    }, [isLoggedInCookie, isOAuth2Enabled, isEndpointPage, isCallbackPage]);
+    }, [isLoggedInCookie, isClientAccountsPopulated, isOAuth2Enabled, isEndpointPage, isCallbackPage]);
 
     return (
         <div className={clsx('layout', { responsive: isDesktop })}>