Restrict geverui cookie to admin unit

4teamwork · Mar 3, 2020 · 17cca83 · 17cca83
1 parent 2d5dec4
commit 17cca83
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt
@@ -4,6 +4,7 @@ Changelog
 2020.2.0rc1 (unreleased)
 ------------------------
 
+- Restrict `geverui` cookie to admin unit. [elioschmutz]
 - Extend the opengever deployment directive with workspace roles. [elioschmutz]
 - Set seen_tours for all users in test fixture. [njohner]
 

diff --git a/opengever/base/browser/resources/base.js b/opengever/base/browser/resources/base.js
@@ -45,6 +45,7 @@ $(document).delegate('body', 'tabbedview.unknownresponse', function(event, overv
  * to the new gever-ui.
  */
 function switchUI(){
-  createCookie('geverui', '1');
+  var pathname = new URL($('body').data('portal-url')).pathname;
+  Cookies.set('geverui', '1', {path: pathname});
   window.location.reload(true);
 }
diff --git a/opengever/base/browser/resources/js_cookie.min.js b/opengever/base/browser/resources/js_cookie.min.js
diff --git a/opengever/core/profiles/default/jsregistry.xml b/opengever/core/profiles/default/jsregistry.xml
@@ -54,6 +54,17 @@
       insert-after="++resource++datetimepicker/js/datetimepicker_widget.js"
       />
 
+  <javascript
+      cacheable="True"
+      compression="none"
+      cookable="True"
+      expression=""
+      enabled="True"
+      id="++resource++opengever.base/js_cookie.min.js"
+      inline="False"
+      insert-before="*"
+      />
+
   <javascript
       cacheable="True"
       compression="none"

diff --git a/opengever/core/upgrades/20200226132815_add_js_cookie/__init__.py b/opengever/core/upgrades/20200226132815_add_js_cookie/__init__.py
diff --git a/opengever/core/upgrades/20200226132815_add_js_cookie/jsregistry.xml b/opengever/core/upgrades/20200226132815_add_js_cookie/jsregistry.xml
@@ -0,0 +1,14 @@
+<object name="portal_javascripts" meta_type="JavaScripts Registry">
+
+  <javascript
+      cacheable="True"
+      compression="none"
+      cookable="True"
+      expression=""
+      enabled="True"
+      id="++resource++opengever.base/js_cookie.min.js"
+      inline="False"
+      insert-before="*"
+      />
+
+</object>
diff --git a/opengever/core/upgrades/20200226132815_add_js_cookie/upgrade.py b/opengever/core/upgrades/20200226132815_add_js_cookie/upgrade.py
@@ -0,0 +1,9 @@
+from ftw.upgrade import UpgradeStep
+
+
+class AddJSCookie(UpgradeStep):
+    """Add js cookie.
+    """
+
+    def __call__(self):
+        self.install_upgrade_profile()