Merge remote-tracking branch 'origin/MC-32864' into 2.4-develop-pr23

Author: serhii-balko

app/code/Magento/Email/Model/AbstractTemplate.php

@@ -546,7 +546,9 @@ protected function applyDesignConfig()
     protected function cancelDesignConfig()
     {
         $this->appEmulation->stopEnvironmentEmulation();
+        $this->urlModel->setScope(null);
         $this->hasDesignBeenApplied = false;
+
         return $this;
     }
 

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

@@ -18,7 +18,7 @@
     </type>
     <type name="Magento\Email\Model\Template">
         <arguments>
-            <argument name="urlModel" xsi:type="object" shared="false">Magento\Framework\Url</argument>
+            <argument name="urlModel" xsi:type="object">Magento\Framework\Url</argument>
         </arguments>
     </type>
     <type name="Magento\Theme\Model\Design\Config\MetadataProvider">

dev/tests/integration/testsuite/Magento/Customer/Model/AccountManagementTest.php

@@ -13,6 +13,8 @@
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\ExpiredException;
 use Magento\Framework\Reflection\DataObjectProcessor;
+use Magento\Framework\Url as UrlBuilder;
+use Magento\Store\Model\StoreManagerInterface;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -651,6 +653,34 @@ public function testGetDefaultAddressesForNonExistentAddress()
         $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
     }
 
+    /**
+     * Test reset password for customer on second website when shared account is enabled
+     *
+     * When customer from second website initiate reset password on first website
+     * global scope should not be reinited to customer scope
+     *
+     * @magentoConfigFixture current_store customer/account_share/scope 0
+     * @magentoDataFixture Magento/Customer/_files/customer_for_second_website.php
+     */
+    public function testInitiatePasswordResetForCustomerOnSecondWebsite()
+    {
+        $storeManager = $this->objectManager->get(StoreManagerInterface::class);
+        $store = $storeManager->getStore();
+
+        $this->accountManagement->initiatePasswordReset(
+            'customer@example.com',
+            AccountManagement::EMAIL_RESET,
+            $storeManager->getWebsite()->getId()
+        );
+
+        $this->assertEquals($store->getId(), $storeManager->getStore()->getId());
+        $urlBuilder = $this->objectManager->get(UrlBuilder::class);
+        // to init scope if it has not inited yet
+        $urlBuilder->setScope($urlBuilder->getData('scope'));
+        $scope = $urlBuilder->getData('scope');
+        $this->assertEquals($store->getId(), $scope->getId());
+    }
+
     /**
      * Set Rp data to Customer in fixture
      *

lib/internal/Magento/Framework/Url.php

@@ -424,8 +424,10 @@ protected function _isSecure()
      */
     public function setScope($params)
     {
-        $this->setData('scope', $this->_scopeResolver->getScope($params));
-        $this->getRouteParamsResolver()->setScope($this->_scopeResolver->getScope($params));
+        $scope = $this->_scopeResolver->getScope($params);
+        $this->setData('scope', $scope);
+        $this->getRouteParamsResolver()->setScope($scope);
+
         return $this;
     }