Merge remote-tracking branch 'magento-l3/ACP2E-2212' into AUG102023_PR_pradeep

Author: pradeep1819

app/code/Magento/Customer/Model/AccountManagement.php

@@ -923,7 +923,11 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
         // Make sure we have a storeId to associate this customer with.
         if (!$customer->getStoreId()) {
             if ($customer->getWebsiteId()) {
-                $storeId = $this->storeManager->getWebsite($customer->getWebsiteId())->getDefaultStore()->getId();
+                $storeId = null;
+                $website = $this->storeManager->getWebsite($customer->getWebsiteId());
+                if ($website->getDefaultStore()) {
+                    $storeId = $website->getDefaultStore()->getId();
+                }
             } else {
                 $this->storeManager->setCurrentStore(null);
                 $storeId = $this->storeManager->getStore()->getId();

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -472,7 +472,7 @@ public function testCreateAccountWithPasswordHashWithCustomerWithoutStoreId(): v
         $website->expects($this->atLeastOnce())
             ->method('getStoreIds')
             ->willReturn([1, 2, 3]);
-        $website->expects($this->once())
+        $website->expects($this->atMost(2))
             ->method('getDefaultStore')
             ->willReturn($store);
         $customer = $this->getMockBuilder(Customer::class)
@@ -551,7 +551,7 @@ public function testCreateAccountWithPasswordHashWithLocalizedException(): void
             ->getMock();
         $website->method('getStoreIds')
             ->willReturn([1, 2, 3]);
-        $website->expects($this->once())
+        $website->expects($this->atMost(2))
             ->method('getDefaultStore')
             ->willReturn($store);
         $customer = $this->getMockBuilder(Customer::class)
@@ -633,7 +633,7 @@ public function testCreateAccountWithPasswordHashWithAddressException(): void
             ->getMock();
         $website->method('getStoreIds')
             ->willReturn([1, 2, 3]);
-        $website->expects($this->once())
+        $website->expects($this->atMost(2))
             ->method('getDefaultStore')
             ->willReturn($store);
         $customer = $this->getMockBuilder(Customer::class)
@@ -2598,4 +2598,55 @@ public function testValidateCustomerStoreIdByWebsiteIdException(): void
 
         $this->assertTrue($this->accountManagement->validateCustomerStoreIdByWebsiteId($customerMock));
     }
+
+    /**
+     * @return void
+     * @throws LocalizedException
+     */
+    public function testCompanyAdminWebsiteDoesNotHaveStore(): void
+    {
+        $this->expectException(LocalizedException::class);
+        $this->expectExceptionMessage('The store view is not in the associated website.');
+
+        $websiteId = 1;
+        $customerId = 1;
+        $customerEmail = 'email@email.com';
+        $hash = '4nj54lkj5jfi03j49f8bgujfgsd';
+
+        $website = $this->getMockBuilder(Website::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $website->method('getStoreIds')
+            ->willReturn([]);
+        $website->expects($this->atMost(1))
+            ->method('getDefaultStore')
+            ->willReturn(null);
+        $customer = $this->getMockBuilder(Customer::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $customer->expects($this->atLeastOnce())
+            ->method('getId')
+            ->willReturn($customerId);
+        $customer->expects($this->once())
+            ->method('getEmail')
+            ->willReturn($customerEmail);
+        $customer->expects($this->atLeastOnce())
+            ->method('getWebsiteId')
+            ->willReturn($websiteId);
+        $customer->method('getStoreId')
+            ->willReturnOnConsecutiveCalls(null, null, 1);
+        $this->customerRepository
+            ->expects($this->once())
+            ->method('get')
+            ->with($customerEmail)
+            ->willReturn($customer);
+        $this->share->method('isWebsiteScope')
+            ->willReturn(true);
+        $this->storeManager
+            ->expects($this->atLeastOnce())
+            ->method('getWebsite')
+            ->with($websiteId)
+            ->willReturn($website);
+        $this->accountManagement->createAccountWithPasswordHash($customer, $hash);
+    }
 }