Use GOVUK cookie helper functions in init

alphagov · Feb 5, 2020 · 1005202 · 1005202
1 parent 15d4206
commit 1005202
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/assets/javascripts/global-bar-init.js b/app/assets/javascripts/global-bar-init.js
@@ -7,14 +7,15 @@ window.GOVUK = window.GOVUK || {}
 // Bump this if you are releasing a major change to the banner
 // This will reset the view count so all users will see the banner, even if previously seen
 var BANNER_VERSION = 3;
+var GLOBAL_BAR_SEEN_COOKIE = "global_bar_seen"
 
 var globalBarInit = {
   getBannerVersion: function() {
     return BANNER_VERSION
   },
 
   getLatestCookie: function() {
-    var currentCookie = document.cookie.match("(?:^|[ ;])(?:global_bar_seen=)(.+?)(?:(?=;|$))")
+    var currentCookie = window.GOVUK.getCookie(GLOBAL_BAR_SEEN_COOKIE)
 
     if (currentCookie == null) {
       return currentCookie
@@ -35,13 +36,13 @@ var globalBarInit = {
   },
 
   setBannerCookie: function() {
-    var cookieCategory = window.GOVUK.getCookieCategory("global_bar_seen")
+    var cookieCategory = window.GOVUK.getCookieCategory(GLOBAL_BAR_SEEN_COOKIE)
     var cookieConsent = GOVUK.getConsentCookie()
 
     if (cookieConsent && cookieConsent[cookieCategory]) {
       var value = JSON.stringify({count: 0, version: globalBarInit.getBannerVersion()})
 
-      window.GOVUK.setCookie("global_bar_seen", value, {days: 84});
+      window.GOVUK.setCookie(GLOBAL_BAR_SEEN_COOKIE, value, {days: 84});
     }
   },