fix: Logout staging cookie, remove expires option on cookies

dives-app · Mar 20, 2021 · f2c4267 · f2c4267
1 parent 7d54988
commit f2c4267
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/utils/setToken.ts b/src/utils/setToken.ts
@@ -14,7 +14,6 @@ export async function setToken(token: string, setCookies: Array<Cookie>) {
     value: token,
     options: {
       domain: SERVER_HOST,
-      expires: new Date(Date.now() + MILLISECONDS_IN_A_WEEK),
       httpOnly: true,
       maxAge: MILLISECONDS_IN_A_WEEK / 100,
       path: "/",

diff --git a/src/utils/unsetToken.ts b/src/utils/unsetToken.ts
@@ -12,11 +12,12 @@ export async function unsetToken(setCookies: Array<Cookie>) {
     value: "",
     options: {
       domain: SERVER_HOST,
-      expires: new Date(Date.now()),
       httpOnly: true,
+      // Set and max-age to unset the cookie in the browser
       maxAge: 0,
       path: "/",
-      sameSite: true,
+      // Disable sameSite to allow localhost development with staging backend
+      sameSite: STAGE === "staging" ? "none" : "strict",
       secure: STAGE !== "dev",
     },
   });