From 93bcf8ade9ac8baa4e8135ef6c31907e1349d0f9 Mon Sep 17 00:00:00 2001
From: Frederico Santos <frederico.f.santos@tecnico.ulisboa.pt>
Date: Sun, 21 Jul 2024 15:55:42 +0100
Subject: [PATCH] fix: Remove unnecessary cookie setting in LoginPhase and
 MenuUiHandler

---
 src/phases.ts                          | 6 +++---
 src/ui/menu-ui-handler.ts              | 2 +-
 src/ui/unavailable-modal-ui-handler.ts | 2 +-
 src/utils.ts                           | 6 +++++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/phases.ts b/src/phases.ts
index 6c87805c12c..b1b64015393 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -98,7 +98,7 @@ export class LoginPhase extends Phase {
           const loadData = () => {
             updateUserInfo().then(success => {
               if (!success[0]) {
-                Utils.setCookie(Utils.sessionIdKey, "");
+                Utils.removeCookie(Utils.sessionIdKey);
                 this.scene.reset(true, true);
                 return;
               }
@@ -119,7 +119,7 @@ export class LoginPhase extends Phase {
                       this.scene.ui.playSelect();
                       updateUserInfo().then(success => {
                         if (!success[0]) {
-                          Utils.setCookie(Utils.sessionIdKey, "");
+                          Utils.removeCookie(Utils.sessionIdKey);
                           this.scene.reset(true, true);
                           return;
                         }
@@ -145,7 +145,7 @@ export class LoginPhase extends Phase {
             ]
           });
         } else if (statusCode === 401) {
-          Utils.setCookie(Utils.sessionIdKey, "");
+          Utils.removeCookie(Utils.sessionIdKey);
           this.scene.reset(true, true);
         } else {
           this.scene.unshiftPhase(new UnavailablePhase(this.scene));
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 91c2a6cb833..5555d1be01c 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -462,7 +462,7 @@ export default class MenuUiHandler extends MessageUiHandler {
             if (!res.ok) {
               console.error(`Log out failed (${res.status}: ${res.statusText})`);
             }
-            Utils.setCookie(Utils.sessionIdKey, "");
+            Utils.removeCookie(Utils.sessionIdKey);
             updateUserInfo().then(() => this.scene.reset(true, true));
           });
         };
diff --git a/src/ui/unavailable-modal-ui-handler.ts b/src/ui/unavailable-modal-ui-handler.ts
index 2f6e1c08832..c864801d9b4 100644
--- a/src/ui/unavailable-modal-ui-handler.ts
+++ b/src/ui/unavailable-modal-ui-handler.ts
@@ -58,7 +58,7 @@ export default class UnavailableModalUiHandler extends ModalUiHandler {
         this.scene.playSound("pb_bounce_1");
         this.reconnectCallback();
       } else if (response[1] === 401) {
-        Utils.setCookie(Utils.sessionIdKey, "");
+        Utils.removeCookie(Utils.sessionIdKey);
         this.scene.reset(true, true);
       } else {
         this.reconnectDuration = Math.min(this.reconnectDuration * 2, this.maxTime); // Set a max delay so it isn't infinite
diff --git a/src/utils.ts b/src/utils.ts
index 77e6610fd95..c6f35526ce5 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -297,7 +297,11 @@ export const isBeta = import.meta.env.MODE === "beta"; // this checks to see if
 export function setCookie(cName: string, cValue: string): void {
   const expiration = new Date();
   expiration.setTime(new Date().getTime() + 3600000 * 24 * 30 * 3/*7*/);
-  document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Domain=beta.pokerogue.net;Path=/;Expires=${expiration.toUTCString()}`;
+  document.cookie = `${cName}=${cValue};Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Expires=${expiration.toUTCString()}`;
+}
+
+export function removeCookie(cName: string): void {
+  document.cookie = `${cName}=;Secure;SameSite=Strict;Domain=${window.location.hostname};Path=/;Expires=Thu, 01 Jan 1970 00:00:00 GMT`;
 }
 
 export function getCookie(cName: string): string {