Merge remote-tracking branch '38462/patch-3' into commpr-21755-2209

Author: harshityadav90

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

@@ -967,7 +967,8 @@ public function createAccountWithPasswordHash(CustomerInterface $customer, $hash
             }
             $this->customerRegistry->remove($customer->getId());
         } catch (InputException $e) {
-            $this->customerRepository->delete($customer);
+            $this->deleteCustomerInSecureArea($customer);
+
             throw $e;
         }
         $customer = $this->customerRepository->getById($customer->getId());
@@ -1678,4 +1679,23 @@ private function isAddressAllowedForWebsite(AddressInterface $address, $storeId)
 
         return in_array($address->getCountryId(), $allowedCountries);
     }
+
+    /**
+     * Set isSecureArea to true, then delete the customer and revert isSecureArea to original value
+     *
+     * @param  CustomerInterface  $customer
+     * @return void
+     * @throws LocalizedException
+     */
+    private function deleteCustomerInSecureArea(CustomerInterface $customer): void
+    {
+        $originalValue = $this->registry->registry('isSecureArea');
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', true);
+
+        $this->customerRepository->delete($customer);
+
+        $this->registry->unregister('isSecureArea');
+        $this->registry->register('isSecureArea', $originalValue);
+    }
 }