Merge pull request #13 from lmachens:lmachens/issue12

🐛 Login broken on Aeternum Map
lmachens · Apr 9, 2022 · 283719c · 283719c
2 parents 66956bc + 2ba5b5b
commit 283719c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@electron-forge/maker-rpm": "^6.0.0-beta.63",
     "@electron-forge/maker-squirrel": "^6.0.0-beta.63",
     "@electron-forge/maker-zip": "^6.0.0-beta.63",
-    "electron": "^18.0.0",
+    "electron": "^18.0.3",
     "electronmon": "^2.0.2"
   },
   "dependencies": {

diff --git a/src/main.js b/src/main.js
@@ -185,23 +185,17 @@ const createWindow = () => {
             } else if (details.responseHeaders["x-frame-options"]) {
               delete details.responseHeaders["x-frame-options"];
             }
-            if (
-              details.responseHeaders["Set-Cookie"]?.length &&
-              !details.responseHeaders["Set-Cookie"][0].includes(
-                "SameSite=none"
-              )
-            ) {
-              details.responseHeaders["Set-Cookie"][0] =
-                details.responseHeaders["Set-Cookie"][0] + "; SameSite=none";
-            }
-            if (
-              details.responseHeaders["set-cookie"]?.length &&
-              !details.responseHeaders["set-cookie"][0].includes(
-                "SameSite=none"
-              )
-            ) {
-              details.responseHeaders["set-cookie"][0] =
-                details.responseHeaders["set-cookie"][0] + "; SameSite=none";
+
+            const setCookieHeaders =
+              details.responseHeaders["Set-Cookie"] ||
+              details.responseHeaders["set-cookie"];
+            if (setCookieHeaders) {
+              for (let index in setCookieHeaders) {
+                if (!setCookieHeaders[index].includes("Secure")) {
+                  setCookieHeaders[index] += "; Secure";
+                }
+                setCookieHeaders[index] += "; SameSite=none";
+              }
             }
 
             callback({