Merge pull request #838 from FitzwilliamMuseum/hotfix/auto-setting-cookies-fix

creating updateConsent function to correctly set cookies on load

Author: ChrisButterworth

public/js/app.js

@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=490bce15c2508c5b88061671cde8f380",
+    "/js/app.js": "/js/app.js?id=fa3734e24a6affb5d47300f4bb8cee22",
     "/js/image-gallery.js": "/js/image-gallery.js?id=d69a0e28c98ea4361c052ddbf98dd62d",
     "/js/events-carousel.js": "/js/events-carousel.js?id=89e31d3ded01942246c364c48d936947",
     "/css/app.css": "/css/app.css?id=880d35bb8b03cfe31ab3a81983fef778",

public/mix-manifest.json

@@ -8,9 +8,24 @@ function gtag() {
     window.dataLayer.push(arguments);
 }
 
+function updateConsent(cookie) {
+    if (cookie.categories.includes('analytics')) {
+        gtag('consent', 'update', {'analytics_storage': 'granted'});
+    } else {
+        gtag('consent', 'update', {'analytics_storage': 'denied'});
+    }
+
+    if (cookie.categories.includes('marketing')) {
+        gtag('consent', 'update', {'ad_storage': 'granted', 'ad_personalization': 'granted', 'ad_user_data': 'granted'});
+    } else {
+        gtag('consent', 'update', {'ad_storage': 'denied', 'ad_personalization': 'denied', 'ad_user_data': 'denied'});
+    }
+}
+
 // run plugin with config object
 CookieConsent.run({
     disablePageInteraction: true,
+    revision: 1, // Update this whenever cookies need to change
     cookie: {
         name: 'fitz-cookies',
         expiresAfterDays: 365,
@@ -188,21 +203,11 @@ CookieConsent.run({
         }
     },
 
-    onConsent: function (cookie) {
-        gtag('consent', 'update', {'analytics_storage': 'granted', 'ad_storage': 'granted', 'ad_personalization': 'granted', 'ad_user_data': 'granted'});
+    onConsent: function ({cookie}) {
+        updateConsent(cookie);
     },
 
-    onChange: function (cookie, changed_preferences) {
-        if (cookie.categories.includes('analytics')) {
-            gtag('consent', 'update', {'analytics_storage': 'granted'});
-        } else {
-            gtag('consent', 'update', {'analytics_storage': 'denied'});
-        }
-
-        if (cookie.categories.includes('marketing')) {
-            gtag('consent', 'update', {'ad_storage': 'granted', 'ad_personalization': 'granted', 'ad_user_data': 'granted'});
-        } else {
-            gtag('consent', 'update', {'ad_storage': 'denied', 'ad_personalization': 'denied', 'ad_user_data': 'denied'});
-        }
+    onChange: function ({cookie}, changed_preferences) {
+        updateConsent(cookie);
     }
 });