From 53ced660acd3f91c2fc5f1aa7413052a9ebbce82 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 20 Dec 2019 14:15:53 +0000
Subject: [PATCH 1/3] Remove analytics cookies from all pages

---
 app/assets/error_pages/5xx.html   | 17 -----------------
 app/templates/admin_template.html | 15 ---------------
 paas-failwhale/index.html         | 15 ---------------
 3 files changed, 47 deletions(-)

diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html
index 1b6cd1691..442a7b35e 100644
--- a/app/assets/error_pages/5xx.html
+++ b/app/assets/error_pages/5xx.html
@@ -125,21 +125,4 @@
 
     <script src="/static/javascripts/govuk-template.js"></script>
 
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-75215134-1', 'auto');
-    ga('set', 'anonymizeIp', true);
-    ga('set', 'displayFeaturesTask', null);
-    ga('set', 'transport', 'beacon');
-    // strip UUIDs
-    page = (window.location.pathname + window.location.search).replace(
-      /[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g, '…'
-    )
-    ga('send', 'pageview');
-  </script>
-
-
 </body></html>
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 64d78f397..4dac3ebc0 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -235,19 +235,4 @@
   <!--[if gt IE 8]><!-->
   <script type="text/javascript" src="{{ asset_url('javascripts/all.js') }}"></script>
   <!--<![endif]-->
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-75215134-1', 'auto');
-    ga('set', 'anonymizeIp', true);
-    ga('set', 'displayFeaturesTask', null);
-    ga('set', 'transport', 'beacon');
-    // strip UUIDs
-    page = (window.location.pathname + window.location.search).replace(
-      /[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g, '…'
-    )
-    ga('send', 'pageview', page);
-  </script>
 {% endblock %}
diff --git a/paas-failwhale/index.html b/paas-failwhale/index.html
index 1082941d9..858225a0d 100644
--- a/paas-failwhale/index.html
+++ b/paas-failwhale/index.html
@@ -126,20 +126,5 @@
 
     <script src="/static_503/govuk-template.js"></script>
 
-  <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-75215134-1', 'auto');
-    ga('set', 'anonymizeIp', true);
-    ga('set', 'displayFeaturesTask', null);
-    ga('set', 'transport', 'beacon');    
-    page = (window.location.pathname + window.location.search).replace(
-      /[a-f0-9]{8}-?[a-f0-9]{4}-?4[a-f0-9]{3}-?[89ab][a-f0-9]{3}-?[a-f0-9]{12}/g, '…'
-    )      
-    ga('send', 'pageview', page);
-  </script>
-
 
 </body></html>

From 751cca9f7d3ae9204068c4f8f0af1fb79c6b0e27 Mon Sep 17 00:00:00 2001
From: Tom Byers <tombaromba@gmail.com>
Date: Fri, 20 Dec 2019 14:48:11 +0000
Subject: [PATCH 2/3] Add code to delete old analytics cookies

---
 app/assets/error_pages/5xx.html   | 9 +++++++++
 app/templates/admin_template.html | 8 ++++++++
 paas-failwhale/index.html         | 9 +++++++++
 3 files changed, 26 insertions(+)

diff --git a/app/assets/error_pages/5xx.html b/app/assets/error_pages/5xx.html
index 442a7b35e..f456dde74 100644
--- a/app/assets/error_pages/5xx.html
+++ b/app/assets/error_pages/5xx.html
@@ -125,4 +125,13 @@
 
     <script src="/static/javascripts/govuk-template.js"></script>
 
+    <script>
+      if (window.GOVUK.cookie('_ga') !== null) {
+        document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+      }
+      if (window.GOVUK.cookie('_gid') !== null) {
+        document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+      }
+    </script>
+
 </body></html>
diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html
index 4dac3ebc0..c7b3954d9 100644
--- a/app/templates/admin_template.html
+++ b/app/templates/admin_template.html
@@ -235,4 +235,12 @@
   <!--[if gt IE 8]><!-->
   <script type="text/javascript" src="{{ asset_url('javascripts/all.js') }}"></script>
   <!--<![endif]-->
+  <script>
+    if (window.GOVUK.cookie('_ga') !== null) {
+      document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+    }
+    if (window.GOVUK.cookie('_gid') !== null) {
+      document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+    }
+  </script>
 {% endblock %}
diff --git a/paas-failwhale/index.html b/paas-failwhale/index.html
index 858225a0d..d1906c32b 100644
--- a/paas-failwhale/index.html
+++ b/paas-failwhale/index.html
@@ -126,5 +126,14 @@
 
     <script src="/static_503/govuk-template.js"></script>
 
+    <script>
+      if (window.GOVUK.cookie('_ga') !== null) {
+        document.cookie = '_ga' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+      }
+      if (window.GOVUK.cookie('_gid') !== null) {
+        document.cookie = '_gid' + '=;expires=' + new Date() + ';domain=.' + window.location.hostname + ';path=/';
+      }
+    </script>
+
 
 </body></html>

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 3/3] 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>