From 968de2b3f7128d394a32d4043e53c7114c979283 Mon Sep 17 00:00:00 2001
From: mayuran-deriv <balamayuran@regentmarkets.com>
Date: Tue, 15 Apr 2025 16:25:08 +0400
Subject: [PATCH 1/2] fix: test link login

---
 src/components/layout/header/header.tsx | 49 ++++++++++++++-----------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/components/layout/header/header.tsx b/src/components/layout/header/header.tsx
index 1b7b43f8..fd13d83d 100644
--- a/src/components/layout/header/header.tsx
+++ b/src/components/layout/header/header.tsx
@@ -1,6 +1,6 @@
 import clsx from 'clsx';
 import { observer } from 'mobx-react-lite';
-import { standalone_routes } from '@/components/shared';
+import { generateOAuthURL, standalone_routes } from '@/components/shared';
 import Button from '@/components/shared_ui/button';
 import useActiveAccount from '@/hooks/api/account/useActiveAccount';
 import { useOauth2 } from '@/hooks/auth/useOauth2';
@@ -33,7 +33,8 @@ const AppHeader = observer(() => {
     const currency = getCurrency?.();
     const { localize } = useTranslations();
 
-    const { isSingleLoggingIn } = useOauth2();
+    // const { isSingleLoggingIn } = useOauth2();
+    const { isOAuth2Enabled, isSingleLoggingIn } = useOauth2();
 
     const renderAccountSection = () => {
         if (isAuthorizing || isSingleLoggingIn) {
@@ -114,27 +115,31 @@ const AppHeader = observer(() => {
                     <Button
                         tertiary
                         onClick={async () => {
-                            const getQueryParams = new URLSearchParams(window.location.search);
-                            const currency = getQueryParams.get('account') ?? '';
-                            const query_param_currency =
-                                sessionStorage.getItem('query_param_currency') || currency || 'USD';
-                            try {
-                                await requestOidcAuthentication({
-                                    redirectCallbackUri: `${window.location.origin}/callback`,
-                                    ...(query_param_currency
-                                        ? {
-                                              state: {
-                                                  account: query_param_currency,
-                                              },
-                                          }
-                                        : {}),
-                                }).catch(err => {
+                            if (!isOAuth2Enabled) {
+                                window.location.replace(generateOAuthURL());
+                            } else {
+                                const getQueryParams = new URLSearchParams(window.location.search);
+                                const currency = getQueryParams.get('account') ?? '';
+                                const query_param_currency =
+                                    sessionStorage.getItem('query_param_currency') || currency || 'USD';
+                                try {
+                                    await requestOidcAuthentication({
+                                        redirectCallbackUri: `${window.location.origin}/callback`,
+                                        ...(query_param_currency
+                                            ? {
+                                                  state: {
+                                                      account: query_param_currency,
+                                                  },
+                                              }
+                                            : {}),
+                                    }).catch(err => {
+                                        // eslint-disable-next-line no-console
+                                        console.error(err);
+                                    });
+                                } catch (error) {
                                     // eslint-disable-next-line no-console
-                                    console.error(err);
-                                });
-                            } catch (error) {
-                                // eslint-disable-next-line no-console
-                                console.error(error);
+                                    console.error(error);
+                                }
                             }
                         }}
                     >

From 26a14d853120f70b666fd880873efd325321c358 Mon Sep 17 00:00:00 2001
From: mayuran-deriv <balamayuran@regentmarkets.com>
Date: Tue, 15 Apr 2025 16:26:23 +0400
Subject: [PATCH 2/2] fix: remove comment

---
 src/components/layout/header/header.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/layout/header/header.tsx b/src/components/layout/header/header.tsx
index fd13d83d..a055c646 100644
--- a/src/components/layout/header/header.tsx
+++ b/src/components/layout/header/header.tsx
@@ -33,7 +33,6 @@ const AppHeader = observer(() => {
     const currency = getCurrency?.();
     const { localize } = useTranslations();
 
-    // const { isSingleLoggingIn } = useOauth2();
     const { isOAuth2Enabled, isSingleLoggingIn } = useOauth2();
 
     const renderAccountSection = () => {