MC-18719: private cookie version increments each post request

Author: vzabaznov

app/code/Magento/Customer/Block/SectionNamesProvider.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Magento\Customer\Block;
+
+use Magento\Framework\Config\DataInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel to get sections names array.
+ */
+class SectionNamesProvider implements ArgumentInterface
+{
+    /**
+     * @var \Magento\Framework\Config\DataInterface
+     */
+    protected $sectionConfig;
+
+    /**
+     * @param \Magento\Framework\Config\DataInterface $sectionConfig
+     */
+    public function __construct(
+        DataInterface $sectionConfig
+    ) {
+        $this->sectionConfig = $sectionConfig->get('sections');
+    }
+
+    /**
+     * Return array of section names based on config.
+     *
+     * @return array
+     */
+    public function getSectionNames()
+    {
+        $resultSectionNames = [];
+        foreach ($this->sectionConfig as $sectionRule => $sectionNames) {
+            if (is_array($sectionNames)) {
+                $resultSectionNames = array_merge($resultSectionNames, $sectionNames);
+            }
+        }
+
+        if ($allNameIndex = array_search('*', $resultSectionNames, true)) {
+            unset($resultSectionNames[$allNameIndex]);
+        }
+
+        return array_values(array_unique($resultSectionNames));
+    }
+}

app/code/Magento/Customer/Block/SectionsNameProvider.php

@@ -157,6 +157,11 @@
             <argument name="sectionConfig" xsi:type="object">SectionInvalidationConfigData</argument>
         </arguments>
     </type>
+    <type name="Magento\Customer\Block\SectionNamesProvider">
+        <arguments>
+            <argument name="sectionConfig" xsi:type="object">SectionInvalidationConfigData</argument>
+        </arguments>
+    </type>
     <preference for="Magento\Customer\CustomerData\JsLayoutDataProviderPoolInterface"
                 type="Magento\Customer\CustomerData\JsLayoutDataProviderPool"/>
     <type name="Magento\Framework\Webapi\ServiceTypeToEntityTypeMap">

app/code/Magento/Customer/etc/di.xml

@@ -41,14 +41,13 @@
                 </arguments>
             </block>
             <block name="customer.section.config" class="Magento\Customer\Block\SectionConfig"
-                   template="Magento_Customer::js/section-config.phtml"/>
-            <block name="customer.customer.data"
-                   class="Magento\Customer\Block\CustomerData"
-                   template="Magento_Customer::js/customer-data.phtml">
+                   template="Magento_Customer::js/section-config.phtml">
                 <arguments>
-                    <argument name="sectionsNameProvider" xsi:type="object">Magento\Customer\Block\SectionsNameProvider</argument>
+                    <argument name="sectionNamesProvider" xsi:type="object">Magento\Customer\Block\SectionNamesProvider</argument>
                 </arguments>
             </block>
+            <block name="customer.customer.data"  class="Magento\Customer\Block\CustomerData"
+                   template="Magento_Customer::js/customer-data.phtml"/>
             <block name="customer.data.invalidation.rules" class="Magento\Customer\Block\CustomerScopeData"
                    template="Magento_Customer::js/customer-data/invalidation-rules.phtml"/>
         </referenceContainer>

app/code/Magento/Customer/view/frontend/layout/default.xml

@@ -14,8 +14,7 @@
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
                 "expirableSectionNames": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getExpirableSectionNames()) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
-                "updateSessionUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/account/updateSession'))) ?>",
-                "sectionsName": <?= $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getData('sectionsNameProvider')->getSectionsName()) ?>
+                "updateSessionUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/account/updateSession'))) ?>"
             }
         }
     }

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -15,7 +15,8 @@
                 "baseUrls": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode(array_unique([
                     $block->getUrl(null, ['_secure' => true]),
                     $block->getUrl(null, ['_secure' => false]),
-                ])) ?>
+                ])) ?>,
+                "sectionNames": <?= $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getData('sectionNamesProvider')->getSectionNames()) ?>
             }
         }
     }

app/code/Magento/Customer/view/frontend/templates/js/section-config.phtml

@@ -320,7 +320,10 @@ define([
             var sectionDataIds,
                 sectionsNamesForInvalidation;
 
-            sectionsNamesForInvalidation = _.contains(sectionNames, '*') ? options.sectionsName : sectionNames;
+            sectionsNamesForInvalidation = _.contains(sectionNames, '*')
+                ? sectionConfig.getSectionNames()
+                : sectionNames;
+            
             $(document).trigger('customer-data-invalidate', [sectionsNamesForInvalidation]);
             buffer.remove(sectionsNamesForInvalidation);
             sectionDataIds = $.cookieStorage.get('section_data_ids') || {};

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -6,7 +6,7 @@
 define(['underscore'], function (_) {
     'use strict';
 
-    var baseUrls, sections, clientSideSections, canonize;
+    var baseUrls, sections, clientSideSections, sectionNames, canonize;
 
     /**
      * @param {String} url
@@ -70,6 +70,15 @@ define(['underscore'], function (_) {
             return _.contains(clientSideSections, sectionName);
         },
 
+        /**
+         * Returns array of section names.
+         *
+         * @returns {Array}
+         */
+        getSectionNames: function () {
+            return sectionNames;
+        },
+
         /**
          * @param {Object} options
          * @constructor
@@ -78,6 +87,7 @@ define(['underscore'], function (_) {
             baseUrls = options.baseUrls;
             sections = options.sections;
             clientSideSections = options.clientSideSections;
+            sectionNames = options.sectionNames;
         }
     };
 });