Merge pull request #277 from rupato-deriv/Fix-oidc-check

fix: removed extra check

Author: rupato-deriv

src/components/layout/index.tsx

@@ -2,6 +2,7 @@ import { useEffect } from 'react';
 import clsx from 'clsx';
 import Cookies from 'js-cookie';
 import { Outlet } from 'react-router-dom';
+import { api_base } from '@/external/bot-skeleton';
 import { useOauth2 } from '@/hooks/auth/useOauth2';
 import { requestOidcAuthentication } from '@deriv-com/auth-client';
 import { useDevice } from '@deriv-com/ui';
@@ -10,12 +11,6 @@ import AppHeader from './header';
 import Body from './main-body';
 import './layout.scss';
 
-function hasAllKeys(obj1, obj2) {
-    const keys1 = Object.keys(obj1);
-    const keys2 = new Set(Object.keys(obj2));
-    return keys1.every(key => keys2.has(key));
-}
-
 const Layout = () => {
     const { isDesktop } = useDevice();
 
@@ -26,19 +21,17 @@ const Layout = () => {
     const isEndpointPage = window.location.pathname.includes('endpoint');
     const checkClientAccount = JSON.parse(localStorage.getItem('clientAccounts') ?? '{}');
     const checkAccountList = JSON.parse(localStorage.getItem('accountList') ?? '{}');
-    const cookiesAccount = JSON.parse(Cookies.get('client.accounts') ?? '{}');
-    const isAccountPresent = hasAllKeys(checkClientAccount, cookiesAccount);
 
-    console.log('clientAccounts', { cookiesAccount, checkClientAccount, checkAccountList, isAccountPresent });
+    console.log('clientAccounts', { checkClientAccount, checkAccountList, api_base });
 
     useEffect(() => {
-        if (isLoggedInCookie && isOAuth2Enabled && !isEndpointPage && !isCallbackPage && !isAccountPresent) {
+        if (isLoggedInCookie && isOAuth2Enabled && !isEndpointPage && !isCallbackPage) {
             console.log('requestOidcAuthentication');
             requestOidcAuthentication({
                 redirectCallbackUri: `${window.location.origin}/callback`,
             });
         }
-    }, [isLoggedInCookie, isOAuth2Enabled, isEndpointPage, isCallbackPage, isAccountPresent]);
+    }, [isLoggedInCookie, isOAuth2Enabled, isEndpointPage, isCallbackPage]);
 
     return (
         <div className={clsx('layout', { responsive: isDesktop })}>