Merge pull request #8338 from magento-l3/JUN062023_PR_2.4.7-beta1-develop

[L3 Kings] 2.4.7-beta1-develop

Author: andimov

app/code/Magento/Customer/Model/App/FrontController/DeleteCookieWhenCustomerNotExistPlugin.php

@@ -130,7 +130,4 @@
     <type name="Magento\Customer\Model\Session">
         <plugin name="afterLogout" type="Magento\Customer\Model\Plugin\ClearSessionsAfterLogoutPlugin"/>
     </type>
-    <type name="Magento\Framework\App\FrontControllerInterface">
-        <plugin name="delete-cookie-when-customer-not-exist" type="Magento\Customer\Model\App\FrontController\DeleteCookieWhenCustomerNotExistPlugin"/>
-    </type>
 </config>

app/code/Magento/Customer/Test/Unit/Model/App/FrontController/DeleteCookieWhenCustomerNotExistPluginTest.php

@@ -48,11 +48,7 @@
                 </arguments>
             </block>
             <block name="customer.customer.data"  class="Magento\Customer\Block\CustomerData"
-                   template="Magento_Customer::js/customer-data.phtml">
-                <arguments>
-                    <argument name="view_model" xsi:type="object">Magento\Customer\ViewModel\Customer\Data</argument>
-                </arguments>
-            </block>
+                   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/ViewModel/Customer/Data.php

@@ -3,27 +3,28 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Customer\ViewModel\Customer\Data;
-use Magento\Framework\App\ObjectManager;
 
 /** @var \Magento\Customer\Block\CustomerData $block */
+/** @var \Magento\Framework\Json\Helper\Data $jsonHelper */
+$expirableSectionNames = $block->getExpirableSectionNames();
 
 // phpcs:disable Magento2.Templates.ThisInTemplate.FoundHelper
-/** @var Data $viewModel */
-$viewModel = $block->getViewModel() ?? ObjectManager::getInstance()->get(Data::class);
-$customerDataUrl = $block->getCustomerDataUrl('customer/account/updateSession');
-$expirableSectionNames = $block->getExpirableSectionNames();
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
+$jsonHelper = $this->helper(\Magento\Framework\Json\Helper\Data::class);
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Customer/js/customer-data": {
                 "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
-                "expirableSectionNames": <?= /* @noEscape */ $viewModel->jsonEncode($expirableSectionNames) ?>,
+                "expirableSectionNames": <?= /* @noEscape */ $jsonHelper->jsonEncode(
+                    $block->getExpirableSectionNames()
+                ) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
-                "updateSessionUrl": "<?= $block->escapeJs($customerDataUrl) ?>",
-                "isLoggedIn": "<?= /* @noEscape */ $viewModel->isLoggedIn() ?>"
+                "updateSessionUrl": "<?= $block->escapeJs(
+                    $block->getCustomerDataUrl('customer/account/updateSession')
+                ) ?>"
             }
         }
     }

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

@@ -47,20 +47,10 @@ define([
      * Invalidate Cache By Close Cookie Session
      */
     invalidateCacheByCloseCookieSession = function () {
-        var isLoggedIn = parseInt(options.isLoggedIn, 10) || 0;
-
         if (!$.cookieStorage.isSet('mage-cache-sessid')) {
             storage.removeAll();
         }
 
-        if (!$.localStorage.isSet('mage-customer-login')) {
-            $.localStorage.set('mage-customer-login', isLoggedIn);
-        }
-        if ($.localStorage.get('mage-customer-login') !== isLoggedIn) {
-            $.localStorage.set('mage-customer-login', isLoggedIn);
-            storage.removeAll();
-        }
-
         $.cookieStorage.set('mage-cache-sessid', true);
     };