From c39bbf46fb0ecd1e3a4b6b9ddef401ce669ca357 Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martinmckeaveney@gmail.com>
Date: Mon, 17 Jan 2022 09:39:22 +0100
Subject: [PATCH] Revert "sameSite and secure cookie settings"

---
 packages/backend-core/src/environment.js | 8 --------
 packages/backend-core/src/utils.js       | 6 ------
 2 files changed, 14 deletions(-)

diff --git a/packages/backend-core/src/environment.js b/packages/backend-core/src/environment.js
index 3db59ab321..c26ad1c199 100644
--- a/packages/backend-core/src/environment.js
+++ b/packages/backend-core/src/environment.js
@@ -6,13 +6,6 @@ function isTest() {
   )
 }
 
-function isDev() {
-  return (
-    process.env.NODE_ENV !== "production" &&
-    process.env.BUDIBASE_ENVIRONMENT !== "production"
-  )
-}
-
 module.exports = {
   JWT_SECRET: process.env.JWT_SECRET,
   COUCH_DB_URL: process.env.COUCH_DB_URL,
@@ -34,7 +27,6 @@ module.exports = {
   COOKIE_DOMAIN: process.env.COOKIE_DOMAIN,
   PLATFORM_URL: process.env.PLATFORM_URL,
   isTest,
-  isDev,
   _set(key, value) {
     process.env[key] = value
     module.exports[key] = value
diff --git a/packages/backend-core/src/utils.js b/packages/backend-core/src/utils.js
index 37193885f1..8c00f2a8b8 100644
--- a/packages/backend-core/src/utils.js
+++ b/packages/backend-core/src/utils.js
@@ -23,7 +23,6 @@ const { getUserSessions, invalidateSessions } = require("./security/sessions")
 const { migrateIfRequired } = require("./migrations")
 const { USER_EMAIL_VIEW_CASING } = require("./migrations").MIGRATIONS
 const { GLOBAL_DB } = require("./migrations").MIGRATION_DBS
-const { isDev, isTest } = require("./environment")
 
 const APP_PREFIX = DocumentTypes.APP + SEPARATOR
 
@@ -109,11 +108,6 @@ exports.setCookie = (ctx, value, name = "builder", opts = { sign: true }) => {
     overwrite: true,
   }
 
-  if (!isDev() && !isTest()) {
-    config.sameSite = "none"
-    config.secure = true
-  }
-
   if (environment.COOKIE_DOMAIN) {
     config.domain = environment.COOKIE_DOMAIN
   }