Merge pull request #97 from thisyahlen-deriv/thisyahlen/cookie-domain…

…-set chore: add cookie domain setter
deriv-com · Nov 22, 2024 · b5144cf · b5144cf
2 parents 7e680d9 + bc2450c
commit b5144cf
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/components/Callback/Callback.tsx b/src/components/Callback/Callback.tsx
@@ -88,10 +88,16 @@ export const Callback = ({
                 const legacyTokens = await requestLegacyToken(accessToken);
 
                 onSignInSuccess?.(legacyTokens);
-                Cookies.set('logged_state', 'true', {
-                    expires: 30,
-                    path: '/',
-                });
+                const domains = ['deriv.com', 'binary.sx', 'pages.dev', 'localhost'];
+                const currentDomain = window.location.hostname.split('.').slice(-2).join('.');
+                if (domains.includes(currentDomain)) {
+                    Cookies.set('logged_state', 'true', {
+                        expires: 30,
+                        path: '/',
+                        domain: currentDomain,
+                        secure: true,
+                    });
+                }
             }
         } catch (err) {
             if (err instanceof Error) {

diff --git a/src/hooks/__tests__/useOAuth2.spec.ts b/src/hooks/__tests__/useOAuth2.spec.ts
@@ -46,6 +46,8 @@ describe('useOAuth2', () => {
         window.dispatchEvent(event);
 
         expect(Cookies.set).toHaveBeenCalledWith('logged_state', 'false', {
+            domain: 'localhost',
+            secure: true,
             expires: 30,
             path: '/',
         });

diff --git a/src/hooks/useOAuth2.ts b/src/hooks/useOAuth2.ts
@@ -44,10 +44,16 @@ export const useOAuth2 = (OAuth2GrowthBookConfig: OAuth2GBConfig, WSLogoutAndRed
 
         const onMessage = (event: MessageEvent) => {
             if (event.data === 'logout_complete') {
-                Cookies.set('logged_state', 'false', {
-                    expires: 30,
-                    path: '/',
-                });
+                const domains = ['deriv.com', 'binary.sx', 'pages.dev', 'localhost'];
+                const currentDomain = window.location.hostname.split('.').slice(-2).join('.');
+                if (domains.includes(currentDomain)) {
+                    Cookies.set('logged_state', 'false', {
+                        expires: 30,
+                        path: '/',
+                        domain: currentDomain,
+                        secure: true,
+                    });
+                }
                 WSLogoutAndRedirect();
                 window.removeEventListener('message', onMessage);
                 cleanup();