From 824f910bfe39b8d789ca3edcfca44b66f603a81c Mon Sep 17 00:00:00 2001
From: Erik Michelson
Date: Thu, 27 Aug 2020 02:04:49 +0200
Subject: Add config option for cookie SameSite policy

Signed-off-by: Erik Michelson <github@erik.michelson.eu>
---
 public/js/lib/common/constant.ejs |  2 ++
 public/js/lib/common/login.js     |  4 ++--
 public/js/lib/editor/index.js     | 16 ++++++++--------
 3 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'public/js/lib')

diff --git a/public/js/lib/common/constant.ejs b/public/js/lib/common/constant.ejs
index 114a9077..2a32c333 100644
--- a/public/js/lib/common/constant.ejs
+++ b/public/js/lib/common/constant.ejs
@@ -8,3 +8,5 @@ window.allowedUploadMimeTypes = <%- JSON.stringify(allowedUploadMimeTypes) %>
 window.linkifyHeaderStyle = '<%- linkifyHeaderStyle %>'
 
 window.DROPBOX_APP_KEY = '<%- DROPBOX_APP_KEY %>'
+
+window.cookiePolicy = '<%- cookiePolicy %>'
diff --git a/public/js/lib/common/login.js b/public/js/lib/common/login.js
index 931c115f..3f7a3e4d 100644
--- a/public/js/lib/common/login.js
+++ b/public/js/lib/common/login.js
@@ -20,12 +20,12 @@ export function resetCheckAuth () {
 export function setLoginState (bool, id) {
   Cookies.set('loginstate', bool, {
     expires: 365,
-    sameSite: 'strict'
+    sameSite: window.cookiePolicy
   })
   if (id) {
     Cookies.set('userid', id, {
       expires: 365,
-      sameSite: 'strict'
+      sameSite: window.cookiePolicy
     })
   } else {
     Cookies.remove('userid')
diff --git a/public/js/lib/editor/index.js b/public/js/lib/editor/index.js
index 07ef58a1..d86ebf3c 100644
--- a/public/js/lib/editor/index.js
+++ b/public/js/lib/editor/index.js
@@ -304,13 +304,13 @@ export default class Editor {
       if (this.editor.getOption('indentWithTabs')) {
         Cookies.set('indent_type', 'tab', {
           expires: 365,
-          sameSite: 'strict'
+          sameSite: window.cookiePolicy
         })
         type.text('Tab Size:')
       } else {
         Cookies.set('indent_type', 'space', {
           expires: 365,
-          sameSite: 'strict'
+          sameSite: window.cookiePolicy
         })
         type.text('Spaces:')
       }
@@ -322,12 +322,12 @@ export default class Editor {
       if (this.editor.getOption('indentWithTabs')) {
         Cookies.set('tab_size', unit, {
           expires: 365,
-          sameSite: 'strict'
+          sameSite: window.cookiePolicy
         })
       } else {
         Cookies.set('space_units', unit, {
           expires: 365,
-          sameSite: 'strict'
+          sameSite: window.cookiePolicy
         })
       }
       widthLabel.text(unit)
@@ -396,7 +396,7 @@ export default class Editor {
       var keymap = this.editor.getOption('keyMap')
       Cookies.set('keymap', keymap, {
         expires: 365,
-        sameSite: 'strict'
+        sameSite: window.cookiePolicy
       })
       label.text(keymap)
       this.restoreOverrideEditorKeymap()
@@ -445,7 +445,7 @@ export default class Editor {
       this.editor.setOption('theme', theme)
       Cookies.set('theme', theme, {
         expires: 365,
-        sameSite: 'strict'
+        sameSite: window.cookiePolicy
       })
 
       checkTheme()
@@ -491,7 +491,7 @@ export default class Editor {
       }
       Cookies.set('spellcheck', mode === 'spell-checker', {
         expires: 365,
-        sameSite: 'strict'
+        sameSite: window.cookiePolicy
       })
 
       checkSpellcheck()
@@ -537,7 +537,7 @@ export default class Editor {
     if (overrideBrowserKeymap.is(':checked')) {
       Cookies.set('preferences-override-browser-keymap', true, {
         expires: 365,
-        sameSite: 'strict'
+        sameSite: window.cookiePolicy
       })
       this.restoreOverrideEditorKeymap()
     } else {
-- 
cgit v1.2.3