MAGETWO-69372: Cookie Restriction Mode Overlay should not be cached by Varnish #6455 #9711

Author: vrann

app/code/Magento/Cookie/Helper/Cookie.php

@@ -70,11 +70,22 @@ public function __construct(
     public function isUserNotAllowSaveCookie()
     {
         $acceptedSaveCookiesWebsites = $this->_getAcceptedSaveCookiesWebsites();
+        return $this->isCookieRestrictionModeEnabled() &&
+            empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
+    }
+
+    /**
+     * Check if cookie restriction mode is enabled for this store
+     *
+     * @return bool
+     */
+    public function isCookieRestrictionModeEnabled()
+    {
         return $this->scopeConfig->getValue(
             self::XML_PATH_COOKIE_RESTRICTION,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
             $this->_currentStore
-        ) && empty($acceptedSaveCookiesWebsites[$this->_website->getId()]);
+        );
     }
 
     /**

app/code/Magento/Cookie/view/frontend/templates/html/notices.phtml

@@ -8,7 +8,7 @@
 
 /** @var \Magento\Cookie\Block\Html\Notices $block */
 ?>
-<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isUserNotAllowSaveCookie()): ?>
+<?php if ($this->helper(\Magento\Cookie\Helper\Cookie::class)->isCookieRestrictionModeEnabled()): ?>
     <div role="alertdialog"
          tabindex="-1"
          class="message global cookie"