From e0f9af810783f3aa55d265198b24cf45bad51fec Mon Sep 17 00:00:00 2001
From: Rebecca Law <rebecca.law@digital.cabinet-office.gov.uk>
Date: Fri, 20 Dec 2019 15:55:37 +0000
Subject: [PATCH] Update the javascript to work for www, non-www, and localhost

---
 app/assets/error_pages/5xx.html   | 4 ++--
 app/templates/admin_template.html | 4 ++--
 paas-failwhale/index.html         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html
index f456dde74..25ea83e21 100644
--- a/app/assets/error_pages/5xx.html
+++ b/app/assets/error_pages/5xx.html
@@ -127,10 +127,10 @@
 
     <script>
       if (window.GOVUK.cookie('_ga') !== null) {
-        document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+        document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
       }
       if (window.GOVUK.cookie('_gid') !== null) {
-        document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+        document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
       }
     </script>
 
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index c7b3954d9..fc709c298 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -237,10 +237,10 @@
   <!--<![endif]-->
   <script>
     if (window.GOVUK.cookie('_ga') !== null) {
-      document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+      document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
     }
     if (window.GOVUK.cookie('_gid') !== null) {
-      document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+      document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
     }
   </script>
 {% endblock %}
diff --git a/paas-failwhale/index.html b/paas-failwhale/index.html
index d1906c32b..cbb41ccb7 100644
--- a/paas-failwhale/index.html
+++ b/paas-failwhale/index.html
@@ -128,10 +128,10 @@
 
     <script>
       if (window.GOVUK.cookie('_ga') !== null) {
-        document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+        document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
       }
       if (window.GOVUK.cookie('_gid') !== null) {
-        document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+        document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=' + window.location.hostname.replace(/^www\./, '.') + ';path=/';
       }
     </script>