AC-6695: Guest Checkout Fix

Author: pawan-adobe-security

app/code/Magento/Customer/Api/AccountManagementInterface.php

@@ -8,6 +8,7 @@
 namespace Magento\Customer\Api;
 
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Interface for managing customers accounts.
@@ -32,7 +33,7 @@ interface AccountManagementInterface
      * @param string $password
      * @param string $redirectUrl
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function createAccount(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
@@ -50,7 +51,7 @@ public function createAccount(
      * @return \Magento\Customer\Api\Data\CustomerInterface
      * @throws \Magento\Framework\Exception\InputException If bad input is provided
      * @throws \Magento\Framework\Exception\State\InputMismatchException If the provided email is already used
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function createAccountWithPasswordHash(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
@@ -63,7 +64,7 @@ public function createAccountWithPasswordHash(
      *
      * @param \Magento\Customer\Api\Data\CustomerInterface $customer
      * @return \Magento\Customer\Api\Data\ValidationResultsInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer);
 
@@ -73,7 +74,7 @@ public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer)
      * @param int $customerId
      * @return bool
      * @throws \Magento\Framework\Exception\NoSuchEntityException If group is not found
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function isReadonly($customerId);
 
@@ -83,7 +84,7 @@ public function isReadonly($customerId);
      * @param string $email
      * @param string $confirmationKey
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function activate($email, $confirmationKey);
 
@@ -93,7 +94,7 @@ public function activate($email, $confirmationKey);
      * @param int $customerId
      * @param string $confirmationKey
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function activateById($customerId, $confirmationKey);
 
@@ -103,7 +104,7 @@ public function activateById($customerId, $confirmationKey);
      * @param string $email
      * @param string $password
      * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function authenticate($email, $password);
 
@@ -114,7 +115,7 @@ public function authenticate($email, $password);
      * @param string $currentPassword
      * @param string $newPassword
      * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function changePassword($email, $currentPassword, $newPassword);
 
@@ -125,7 +126,7 @@ public function changePassword($email, $currentPassword, $newPassword);
      * @param string $currentPassword
      * @param string $newPassword
      * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function changePasswordById($customerId, $currentPassword, $newPassword);
 
@@ -136,7 +137,7 @@ public function changePasswordById($customerId, $currentPassword, $newPassword);
      * @param string $template
      * @param int $websiteId
      * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function initiatePasswordReset($email, $template, $websiteId = null);
 
@@ -149,7 +150,7 @@ public function initiatePasswordReset($email, $template, $websiteId = null);
      * @param string $newPassword
      *
      * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @throws InputException
      */
     public function resetPassword($email, $resetToken, $newPassword);
@@ -166,7 +167,7 @@ public function resetPassword($email, $resetToken, $newPassword);
      * @throws \Magento\Framework\Exception\State\ExpiredException If token is expired
      * @throws \Magento\Framework\Exception\InputException If token or customer id is invalid
      * @throws \Magento\Framework\Exception\NoSuchEntityException If customer doesn't exist
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken);
 
@@ -175,7 +176,7 @@ public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkTo
      *
      * @param int $customerId
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getConfirmationStatus($customerId);
 
@@ -186,27 +187,27 @@ public function getConfirmationStatus($customerId);
      * @param int $websiteId
      * @param string $redirectUrl
      * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function resendConfirmation($email, $websiteId, $redirectUrl = '');
 
     /**
      * Check if given email is associated with a customer account in given website.
      *
      * @param string $customerEmail
-     * @param int $websiteId If not set, will use the current websiteId
+     * @param int|null $websiteId If not set, will use the current websiteId
      * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
-    public function isEmailAvailable($customerEmail, $websiteId = null);
+    public function isEmailAvailable(string $customerEmail, int $websiteId = null): bool;
 
     /**
      * Check store availability for customer given the customerId.
      *
      * @param int $customerWebsiteId
      * @param int $storeId
      * @return bool
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function isCustomerInStore($customerWebsiteId, $storeId);
 
@@ -216,7 +217,7 @@ public function isCustomerInStore($customerWebsiteId, $storeId);
      * @param int $customerId
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If the customer Id is invalid
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getDefaultBillingAddress($customerId);
 
@@ -226,7 +227,7 @@ public function getDefaultBillingAddress($customerId);
      * @param int $customerId
      * @return \Magento\Customer\Api\Data\AddressInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException If the customer Id is invalid
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
     public function getDefaultShippingAddress($customerId);
 

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

@@ -1143,7 +1143,7 @@ public function validate(CustomerInterface $customer)
     /**
      * @inheritdoc
      */
-    public function isEmailAvailable($customerEmail, $websiteId = null)
+    public function isEmailAvailable(string $customerEmail, int $websiteId = null): bool
     {
         $guestLoginConfig = $this->scopeConfig->getValue(
             self::GUEST_CHECKOUT_LOGIN_OPTION_SYS_CONFIG,