MC-18719: private cookie version increments each post request

Author: vzabaznov

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

@@ -0,0 +1,36 @@
+<?php
+
+namespace Magento\Customer\Block;
+
+use Magento\Customer\CustomerData\SectionPoolInterface;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+/**
+ * ViewModel to get sections names array.
+ */
+class SectionsNameProvider implements ArgumentInterface
+{
+    /**
+     * @var SectionPoolInterface
+     */
+    private $sectionPool;
+
+    /**
+     * @param SectionPoolInterface $sectionPool
+     */
+    public function __construct(
+        SectionPoolInterface $sectionPool
+    ) {
+        $this->sectionPool = $sectionPool;
+    }
+
+    /**
+     * Return array of section names.
+     *
+     * @return array
+     */
+    public function getSectionsName()
+    {
+        return array_keys($this->sectionPool->getSectionsData());
+    }
+}

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

@@ -44,7 +44,11 @@
                    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/customer-data.phtml">
+                <arguments>
+                    <argument name="sectionsNameProvider" xsi:type="object">Magento\Customer\Block\SectionsNameProvider</argument>
+                </arguments>
+            </block>
             <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/templates/js/customer-data.phtml

@@ -14,7 +14,8 @@
                 "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'))) ?>"
+                "updateSessionUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/account/updateSession'))) ?>",
+                "sectionsName": <?= $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getData('sectionsNameProvider')->getSectionsName()) ?>
             }
         }
     }

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

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