Merge remote-tracking branch 'origin/BUG#AC-2235' into spartans_pr_04082022

Author: glo80326

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

@@ -726,6 +726,9 @@ public function resetPassword($email, $resetToken, $newPassword)
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
+        $customerSecure->setFailuresNum(0);
+        $customerSecure->setFirstFailure(null);
+        $customerSecure->setLockExpires(null);
         $this->sessionCleaner->clearFor((int)$customer->getId());
         $this->customerRepository->save($customer);
 
@@ -1216,6 +1219,7 @@ public function isReadonly($customerId)
      * @return $this
      * @throws LocalizedException
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     protected function sendNewAccountEmail(
         $customer,
@@ -1259,6 +1263,7 @@ protected function sendNewAccountEmail(
      * @throws LocalizedException
      * @throws NoSuchEntityException
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     protected function sendPasswordResetNotificationEmail($customer)
     {
@@ -1272,6 +1277,7 @@ protected function sendPasswordResetNotificationEmail($customer)
      * @param int|string|null $defaultStoreId
      * @return int
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      * @throws LocalizedException
      */
     protected function getWebsiteStoreId($customer, $defaultStoreId = null)
@@ -1289,6 +1295,7 @@ protected function getWebsiteStoreId($customer, $defaultStoreId = null)
      *
      * @return array
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     protected function getTemplateTypes()
     {
@@ -1322,6 +1329,7 @@ protected function getTemplateTypes()
      * @return $this
      * @throws MailException
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     protected function sendEmailTemplate(
         $customer,
@@ -1476,6 +1484,7 @@ public function changeResetPasswordLinkToken(CustomerInterface $customer, string
      * @throws LocalizedException
      * @throws NoSuchEntityException
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     public function sendPasswordReminderEmail($customer)
     {
@@ -1505,6 +1514,7 @@ public function sendPasswordReminderEmail($customer)
      * @throws LocalizedException
      * @throws NoSuchEntityException
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     public function sendPasswordResetConfirmationEmail($customer)
     {
@@ -1550,6 +1560,7 @@ protected function getAddressById(CustomerInterface $customer, $addressId)
      * @return Data\CustomerSecure
      * @throws NoSuchEntityException
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     protected function getFullCustomerObject($customer)
     {
@@ -1595,6 +1606,7 @@ private function disableAddressValidation($customer)
      *
      * @return EmailNotificationInterface
      * @deprecated 100.1.0
+     * @see MAGETWO-71174
      */
     private function getEmailNotification()
     {

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

@@ -1820,7 +1820,10 @@ private function reInitModel(): void
                     'getPasswordHash',
                     'setPasswordHash',
                     'setRpToken',
-                    'setRpTokenCreatedAt'
+                    'setRpTokenCreatedAt',
+                    'setFailuresNum',
+                    'setFirstFailure',
+                    'setLockExpires',
                 ]
             )
             ->getMock();
@@ -2039,6 +2042,9 @@ function ($string) {
         $this->customerSecure->expects($this->once())->method('setRpToken')->with(null);
         $this->customerSecure->expects($this->once())->method('setRpTokenCreatedAt')->with(null);
         $this->customerSecure->expects($this->any())->method('setPasswordHash')->willReturn(null);
+        $this->customerSecure->expects($this->once())->method('setFailuresNum')->with(0);
+        $this->customerSecure->expects($this->once())->method('setFirstFailure')->with(null);
+        $this->customerSecure->expects($this->once())->method('setLockExpires')->with(null);
         $this->sessionCleanerMock->expects($this->once())->method('clearFor')->with($customerId)->willReturnSelf();
 
         $this->assertTrue($this->accountManagement->resetPassword($customerEmail, $resetToken, $newPassword));