Merge pull request #287 from rupato-deriv/Rupato/Fix--oauth-route-aft…

…er-callback fix: oauth route after the callback
deriv-com · Feb 19, 2025 · f7c4bc4 · f7c4bc4
2 parents 1df6d60 + 9a3d0f9
commit f7c4bc4
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx
@@ -29,7 +29,7 @@ const Layout = () => {
         Object.values(checkClientAccount).some(account => account.currency === currency) ||
         currency === 'demo' ||
         currency === '';
-    const [clientHasCurrency] = useState(ifClientAccountHasCurrency);
+    const [clientHasCurrency, setClientHasCurrency] = useState(ifClientAccountHasCurrency);
 
     const validCurrencies = [...fiat_currencies_display_order, ...crypto_currencies_display_order];
     const query_currency = (getQueryParams.get('account') ?? '')?.toUpperCase();
@@ -40,21 +40,21 @@ const Layout = () => {
     const validateApiAccounts = ({ data }: any) => {
         if (data.msg_type === 'authorize') {
             api_accounts.push(data.authorize.account_list || []);
-            console.log('api_accounts', api_accounts);
-            console.log('checkClientAccount', checkClientAccount);
-            api_accounts?.flat().map(data => {
-                Object.values(checkClientAccount).map(key => {
-                    console.log('outside data.currency', data.currency);
-                    console.log('outside key.currency', key.currency);
-                    if (data.currency !== key.currency) {
-                        console.log('setClientHasCurrency');
-                        console.log('data.currency', data.currency);
-                        console.log('key.currency', key.currency);
-                        //setClientHasCurrency(false);
-                    }
-                });
+            const allCurrencies = new Set(Object.values(checkClientAccount).map(acc => acc.currency));
+
+            const hasMissingCurrency = api_accounts?.flat().some(data => {
+                if (!allCurrencies.has(data.currency)) {
+                    return true;
+                }
+                return false;
             });
 
+            if (hasMissingCurrency) {
+                setClientHasCurrency(false);
+            } else {
+                console.log('All currencies are present');
+            }
+
             if (subscription) {
                 subscription?.unsubscribe();
             }
@@ -68,11 +68,11 @@ const Layout = () => {
         }
     }, []);
 
-    console.log('clientHasCurrency', clientHasCurrency);
-
     useEffect(() => {
-        if (isLoggedInCookie && !isClientAccountsPopulated && isOAuth2Enabled && !isEndpointPage && !isCallbackPage) {
-            console.log('requestOidcAuthentication');
+        if (
+            (isLoggedInCookie && !isClientAccountsPopulated && isOAuth2Enabled && !isEndpointPage && !isCallbackPage) ||
+            !clientHasCurrency
+        ) {
             requestOidcAuthentication({
                 redirectCallbackUri: `${window.location.origin}/callback`,
             });

diff --git a/src/pages/callback/callback-page.tsx b/src/pages/callback/callback-page.tsx
@@ -53,7 +53,7 @@ const CallbackPage = () => {
                     localStorage.setItem('active_loginid', tokens.acct1);
                 }
 
-                window.location.assign('/');
+                window.location.assign(window.history.state?.from || '/');
             }}
             renderReturnButton={() => {
                 return (