Merge pull request #234 from forio/samesite.re

samesite to account for local dev
forio · Aug 3, 2020 · 691d5fb · 691d5fb
2 parents 9a80532 + e55f3a9
commit 691d5fb
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/dist/components/assignment/index.html b/dist/components/assignment/index.html
@@ -7,7 +7,7 @@
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
-        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.13.1/components/assignment/assignment.css">
+        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.13.2/components/assignment/assignment.css">
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/2.4.1/lodash.js"></script>
     </head>
@@ -73,8 +73,8 @@
         </div>
     </div>
         <!-- make sure to include jquery, epicenter.js and assignment.js -->
-    <script src="https://forio.com/tools/js-libs/2.13.1/epicenter.min.js"></script>
-    <script src="https://forio.com/tools/js-libs/2.13.1/components/assignment/assignment.js"></script>
+    <script src="https://forio.com/tools/js-libs/2.13.2/epicenter.min.js"></script>
+    <script src="https://forio.com/tools/js-libs/2.13.2/components/assignment/assignment.js"></script>
     <script>
         new window.forio.MultiplayerAssignmentComponent({
             el: '#assignment-component',

diff --git a/dist/components/login/login.html b/dist/components/login/login.html
@@ -11,12 +11,12 @@
         <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 
         <!-- login.css provides styling for the group selector pop over dialog -->
-        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.13.1/components/login/login.css">
+        <link rel="stylesheet" href="https://forio.com/tools/js-libs/2.13.2/components/login/login.css">
 
         <!-- make sure to include jquery, epicenter.js and login.js -->
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
-        <script src="https://forio.com/tools/js-libs/2.13.1/epicenter.min.js"></script>
-        <script src="https://forio.com/tools/js-libs/2.13.1/components/login/login.js"></script>
+        <script src="https://forio.com/tools/js-libs/2.13.2/epicenter.min.js"></script>
+        <script src="https://forio.com/tools/js-libs/2.13.2/components/login/login.js"></script>
     </head>
     <body>
         <!--

diff --git a/dist/epicenter.js b/dist/epicenter.js
diff --git a/dist/epicenter.js.map b/dist/epicenter.js.map
diff --git a/dist/epicenter.min.js b/dist/epicenter.min.js
diff --git a/dist/epicenter.min.js.map b/dist/epicenter.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "epicenter-js",
-    "version": "2.13.1",
+    "version": "2.13.2",
     "repository": {
         "type": "git",
         "url": "https://github.com/forio/epicenter-js-libs"

diff --git a/src/store/cookie-store.js b/src/store/cookie-store.js
@@ -90,6 +90,8 @@ module.exports = function (config) {
             }
             if (samesite) {
                 contents.push(`samesite=${samesite}`);
+            } else if (domain === '.local.forio.com') {
+                contents.push('samesite=lax');
             } else {
                 contents.push('samesite=none');
             }