ACP2E-98: Customer with global account sharing has to login again in the secondary website when guest checkout is disabled

- Added view model for getting store config flag on the UI, removed code from block API code.

Author: Mohan Ahuja

app/code/Magento/Customer/Block/Account/AuthenticationPopup.php

@@ -119,16 +119,4 @@ public function getCustomerForgotPasswordUrl()
     {
         return $this->getUrl('customer/account/forgotpassword');
     }
-
-    /**
-     * Get global account sharing is enabled or not
-     *
-     * @return string
-     */
-    public function isGlobalScopeEnabled()
-    {
-        $shareConfig = \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Customer\Model\Config\Share::class);
-        return $shareConfig->isGlobalScope();
-    }
 }

app/code/Magento/Customer/ViewModel/Customer/StoreConfig.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Customer\ViewModel\Customer;
+
+use Magento\Customer\Model\Config\Share as ConfigShare;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+class StoreConfig implements ArgumentInterface
+{
+
+    /**
+     * @var ConfigShare
+     */
+    private ConfigShare $configShare;
+
+    /**
+     * Constructor
+     *
+     * @param ConfigShare $configShare
+     */
+    public function __construct(
+        ConfigShare $configShare
+    ) {
+        $this->configShare = $configShare;
+    }
+
+    /**
+     * Get global account sharing is enabled or not
+     *
+     * @return bool
+     */
+    public function isGlobalScopeEnabled(): bool
+    {
+        return $this->configShare->isGlobalScope();
+    }
+}

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

@@ -38,6 +38,7 @@
                             </item>
                         </item>
                     </argument>
+                    <argument name="view_model" xsi:type="object">Magento\Customer\ViewModel\Customer\StoreConfig</argument>
                 </arguments>
             </block>
             <block name="customer.section.config" class="Magento\Customer\Block\SectionConfig"

app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml

@@ -6,6 +6,8 @@
 
 /** @var \Magento\Customer\Block\Account\AuthenticationPopup $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var Magento\Customer\ViewModel\Customer\StoreConfig $viewModel */
+$viewModel = $block->getViewModel();
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
@@ -21,7 +23,7 @@
                 "Magento_Ui/js/block-loader": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl(
                     'images/loader-1.gif'
                 ))) ?>"
-                <?php if ($block->isGlobalScopeEnabled()): ?>
+                <?php if ($viewModel->isGlobalScopeEnabled()): ?>
                 ,
                 "Magento_Customer/js/customer-global-session-loader": {}
                 <?php endif; ?>