AC-6695: Guest Checkout Fix

Author: pawan-adobe-security

app/code/Magento/Checkout/etc/adminhtml/system.xml

@@ -13,6 +13,10 @@
             <resource>Magento_Checkout::checkout</resource>
             <group id="options" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Checkout Options</label>
+                <field id="disable_guest_checkout_login" translate="label" type="select" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+                    <label>Disable Guest Checkout Login</label>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
                 <field id="onepage_checkout_enabled" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable Onepage Checkout</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>

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

@@ -7,7 +7,14 @@
 
 namespace Magento\Customer\Api;
 
+use Magento\Customer\Api\Data\AddressInterface;
+use Magento\Customer\Api\Data\CustomerInterface;
+use Magento\Customer\Api\Data\ValidationResultsInterface;
 use Magento\Framework\Exception\InputException;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Exception\State\ExpiredException;
+use Magento\Framework\Exception\State\InputMismatchException;
 
 /**
  * Interface for managing customers accounts.
@@ -28,11 +35,11 @@ interface AccountManagementInterface
     /**
      * Create customer account. Perform necessary business operations like sending email.
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @param string $password
+     * @param CustomerInterface $customer
+     * @param string|null $password
      * @param string $redirectUrl
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return CustomerInterface
+     * @throws LocalizedException
      */
     public function createAccount(
         \Magento\Customer\Api\Data\CustomerInterface $customer,
@@ -43,69 +50,69 @@ public function createAccount(
     /**
      * Create customer account using provided hashed password. Should not be exposed as a webapi.
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
+     * @param CustomerInterface $customer
      * @param string $hash Password hash that we can save directly
      * @param string $redirectUrl URL fed to welcome email templates. Can be used by templates to, for example, direct
      *                            the customer to a product they were looking at after pressing confirmation link.
-     * @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
+     * @return CustomerInterface
+     * @throws InputException If bad input is provided
+     * @throws InputMismatchException If the provided email is already used
+     * @throws LocalizedException
      */
     public function createAccountWithPasswordHash(
-        \Magento\Customer\Api\Data\CustomerInterface $customer,
-        $hash,
-        $redirectUrl = ''
-    );
+        CustomerInterface $customer,
+        string            $hash,
+        string $redirectUrl = ''
+    ): CustomerInterface;
 
     /**
      * Validate customer data.
      *
-     * @param \Magento\Customer\Api\Data\CustomerInterface $customer
-     * @return \Magento\Customer\Api\Data\ValidationResultsInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param CustomerInterface $customer
+     * @return ValidationResultsInterface
+     * @throws LocalizedException
      */
-    public function validate(\Magento\Customer\Api\Data\CustomerInterface $customer);
+    public function validate(CustomerInterface $customer): ValidationResultsInterface;
 
     /**
      * Check if customer can be deleted.
      *
      * @param int $customerId
      * @return bool
-     * @throws \Magento\Framework\Exception\NoSuchEntityException If group is not found
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws NoSuchEntityException If group is not found
+     * @throws LocalizedException
      */
-    public function isReadonly($customerId);
+    public function isReadonly(int $customerId): bool;
 
     /**
      * Activate a customer account using a key that was sent in a confirmation email.
      *
      * @param string $email
      * @param string $confirmationKey
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return CustomerInterface
+     * @throws LocalizedException
      */
-    public function activate($email, $confirmationKey);
+    public function activate(string $email, string $confirmationKey): CustomerInterface;
 
     /**
      * Activate a customer account using a key that was sent in a confirmation email.
      *
      * @param int $customerId
      * @param string $confirmationKey
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return CustomerInterface
+     * @throws LocalizedException
      */
-    public function activateById($customerId, $confirmationKey);
+    public function activateById(int $customerId, string $confirmationKey): CustomerInterface;
 
     /**
      * Authenticate a customer by username and password
      *
      * @param string $email
      * @param string $password
-     * @return \Magento\Customer\Api\Data\CustomerInterface
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @return CustomerInterface
+     * @throws LocalizedException
      */
-    public function authenticate($email, $password);
+    public function authenticate(string $email, string $password): CustomerInterface;
 
     /**
      * Change customer password.
@@ -114,9 +121,9 @@ 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);
+    public function changePassword(string $email, string $currentPassword, string $newPassword): bool;
 
     /**
      * Change customer password.
@@ -125,20 +132,20 @@ 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);
+    public function changePasswordById(int $customerId, string $currentPassword, string $newPassword): bool;
 
     /**
      * Send an email to the customer with a password reset link.
      *
      * @param string $email
      * @param string $template
-     * @param int $websiteId
+     * @param int|null $websiteId
      * @return bool true on success
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
-    public function initiatePasswordReset($email, $template, $websiteId = null);
+    public function initiatePasswordReset(string $email, string $template, int $websiteId = null): bool;
 
     /**
      * Reset customer password.
@@ -149,10 +156,10 @@ 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);
+    public function resetPassword(string $email, string $resetToken, string $newPassword): bool;
 
     /**
      * Check if password reset token is valid.
@@ -162,22 +169,22 @@ public function resetPassword($email, $resetToken, $newPassword);
      * @param string $resetPasswordLinkToken
      *
      * @return bool True if the token is valid
-     * @throws \Magento\Framework\Exception\State\InputMismatchException If token is mismatched
-     * @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 InputMismatchException If token is mismatched
+     * @throws ExpiredException If token is expired
+     * @throws InputException If token or customer id is invalid
+     * @throws NoSuchEntityException If customer doesn't exist
+     * @throws LocalizedException
      */
-    public function validateResetPasswordLinkToken($customerId, $resetPasswordLinkToken);
+    public function validateResetPasswordLinkToken(int $customerId, string $resetPasswordLinkToken): bool;
 
     /**
      * Gets the account confirmation status.
      *
      * @param int $customerId
      * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      */
-    public function getConfirmationStatus($customerId);
+    public function getConfirmationStatus(int $customerId): string;
 
     /**
      * Resend confirmation email.
@@ -186,55 +193,55 @@ 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 = '');
+    public function resendConfirmation(string $email, int $websiteId, string $redirectUrl = ''): bool;
 
     /**
      * 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);
+    public function isCustomerInStore(int $customerWebsiteId, int $storeId): bool;
 
     /**
      * Retrieve default billing address for the given 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
+     * @return AddressInterface
+     * @throws NoSuchEntityException If the customer Id is invalid
+     * @throws LocalizedException
      */
-    public function getDefaultBillingAddress($customerId);
+    public function getDefaultBillingAddress(int $customerId): Data\AddressInterface;
 
     /**
      * Retrieve default shipping address for the given 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
+     * @return AddressInterface
+     * @throws NoSuchEntityException If the customer Id is invalid
+     * @throws LocalizedException
      */
-    public function getDefaultShippingAddress($customerId);
+    public function getDefaultShippingAddress(int $customerId): AddressInterface;
 
     /**
      * Return hashed password, which can be directly saved to database.
      *
      * @param string $password
      * @return string
      */
-    public function getPasswordHash($password);
+    public function getPasswordHash(string $password): string;
 }