From e7d44670482dac5941bf87580abf65d660e47fc6 Mon Sep 17 00:00:00 2001
From: dragosgd <dragosdanciulescug@gmail.com>
Date: Tue, 16 Sep 2025 14:03:23 +0300
Subject: [PATCH] Fix cookie bug

---
 source/_templates/analytics.html | 124 +++++++++++++++++--------------
 1 file changed, 68 insertions(+), 56 deletions(-)

diff --git a/source/_templates/analytics.html b/source/_templates/analytics.html
index a6ed39f380..45432a524c 100644
--- a/source/_templates/analytics.html
+++ b/source/_templates/analytics.html
@@ -1,71 +1,83 @@
-<div id="cookie-consent" class="consent">
+<div id="cookie-consent" class="consent">     
     <p>This website only aggregates and analyzes the actions you take here if you allow cookies. If you do not allow cookies, it protects your privacy, but also prevents the owner from learning from your actions and creating a better experience for you and other users.</p><p>Note that if you opt in and you clear your cookies, delete the opt-in cookie, or if you change computers or Web browsers, you will need to perform the opt-in procedure again.</p>
-    <button onclick="consentGranted()">Allow</button>
-    <button onclick="consentDenied()">Decline</button>
-    <a href="https://concordium.com/privacy-policy/">Privacy policy</a>
-</div>
+    <button onclick="consentGranted()">Allow</button>     
+    <button onclick="consentDenied()">Decline</button>     
+    <a href="https://concordium.com/privacy-policy/">Privacy policy</a> 
+</div>  
 
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
+<!-- Matomo --> 
+<script>   
+var _paq = window._paq = window._paq || [];  
 
-// Save the choice in a cookie
-function storeChoice(granted) {
-  document.cookie = "cookie-consent=" + granted
-}
+// Save the choice in a cookie with proper attributes
+function storeChoice(granted) {   
+    // Set cookie with 1 year expiration, path, and secure attributes
+    const expires = new Date();
+    expires.setFullYear(expires.getFullYear() + 1);
+    document.cookie = "cookie-consent=" + granted + "; expires=" + expires.toUTCString() + "; path=/; SameSite=Lax";
+}  
 
-// Look for a cookie storing the previous choice of the user.
-// Returns undefined if no choice was stored, otherwise a boolean for whether the
-// user gave consent.
-function loadChoice() {
-  if (!document.cookie.includes("cookie-consent=")) {
-      return undefined;
-  }
-  return document.cookie.includes("cookie-consent=true")
-}
+// Look for a cookie storing the previous choice of the user. 
+// Returns null if no choice was stored, true if granted, false if denied
+function loadChoice() {   
+    if (!document.cookie.includes("cookie-consent=")) {       
+        return null;   
+    }   
+    return document.cookie.includes("cookie-consent=true");
+}  
 
-// Removes the cookie consent banner
-function removeCookieConsentBanner() {
-  document.getElementById("cookie-consent").remove()
-}
+// Removes the cookie consent banner safely
+function removeCookieConsentBanner() {   
+    const banner = document.getElementById("cookie-consent");
+    if (banner) {
+        banner.remove();
+    }
+}  
 
 // Called by the cookie consent banner if granted permission
-function consentGranted() {
-  storeChoice(true)
-  _paq.push(['setCookieConsentGiven']);
-  removeCookieConsentBanner()
-}
+function consentGranted() {   
+    storeChoice(true);
+    _paq.push(['setCookieConsentGiven']);   
+    removeCookieConsentBanner();
+}  
 
 // Called by the cookie consent banner if denied permission
-function consentDenied() {
-  storeChoice(true)
-  removeCookieConsentBanner()
-}
+function consentDenied() {   
+    storeChoice(false);  // FIXED: Now correctly stores false
+    removeCookieConsentBanner();
+}  
 
-const stored = loadChoice();
-if (stored) {
- consentGranted()
+// Check for stored consent and act accordingly
+const stored = loadChoice(); 
+if (stored === true) {
+    // User previously granted consent
+    _paq.push(['setCookieConsentGiven']);
+    removeCookieConsentBanner();
+} else if (stored === false) {
+    // User previously denied consent
+    removeCookieConsentBanner();
 }
+// If stored === null, show the banner (do nothing)
 
-_paq.push(['requireCookieConsent']);
-/* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-
-(function() {
-    var u="https://concordium.matomo.cloud/";
-    _paq.push(['setTrackerUrl', u+'matomo.php']);
-    _paq.push(['setSiteId', '2']);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.async=true; g.src='//cdn.matomo.cloud/concordium.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);
-  })();
+_paq.push(['requireCookieConsent']); 
+/* tracker methods like "setCustomDimension" should be called before "trackPageView" */ 
+_paq.push(['trackPageView']); 
+_paq.push(['enableLinkTracking']);  
 
-  // remember tracking consent was given for all subsequent page views and visits
-_paq.push(['rememberCookieConsentGiven']);
-
-</script>
+(function() {     
+    var u="https://concordium.matomo.cloud/";     
+    _paq.push(['setTrackerUrl', u+'matomo.php']);     
+    _paq.push(['setSiteId', '2']);     
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];     
+    g.async=true; g.src='//cdn.matomo.cloud/concordium.matomo.cloud/matomo.js'; s.parentNode.insertBefore(g,s);   
+})();    
 
+// Only remember consent if it was actually granted
+if (stored === true) {
+    _paq.push(['rememberCookieConsentGiven']);
+}
+</script>   
 
-<!-- Start of HubSpot Embed Code -->
-<script type="text/javascript" id="hs-script-loader" async defer src="//js.hs-scripts.com/4771748.js"></script>
-<!-- End of HubSpot Embed Code -->
+<!-- Start of HubSpot Embed Code --> 
+<script type="text/javascript" id="hs-script-loader" async defer src="//js.hs-scripts.com/4771748.js"></script> 
+<!-- End of HubSpot Embed Code -->
\ No newline at end of file