ACP2E-3246: Customer API - Login Failures Number Not Able To Reset To 0 After Successful Login

Author: glo23503

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

@@ -7,8 +7,8 @@
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Model\ResourceModel\CustomerRepository;
-use Magento\Customer\Model\CustomerAuthUpdate;
 use Magento\Backend\App\ConfigInterface;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Encryption\EncryptorInterface as Encryptor;
 use Magento\Framework\Exception\InvalidEmailOrPasswordException;
 use Magento\Framework\Exception\State\UserLockedException;
@@ -67,19 +67,22 @@ class Authentication implements AuthenticationInterface
      * @param ConfigInterface $backendConfig
      * @param \Magento\Framework\Stdlib\DateTime $dateTime
      * @param Encryptor $encryptor
+     * @param CustomerAuthUpdate|null $customerAuthUpdate
      */
     public function __construct(
         CustomerRepositoryInterface $customerRepository,
         CustomerRegistry $customerRegistry,
         ConfigInterface $backendConfig,
         \Magento\Framework\Stdlib\DateTime $dateTime,
-        Encryptor $encryptor
+        Encryptor $encryptor,
+        CustomerAuthUpdate $customerAuthUpdate = null
     ) {
         $this->customerRepository = $customerRepository;
         $this->customerRegistry = $customerRegistry;
         $this->backendConfig = $backendConfig;
         $this->dateTime = $dateTime;
         $this->encryptor = $encryptor;
+        $this->customerAuthUpdate = $customerAuthUpdate ?: ObjectManager::getInstance()->get(CustomerAuthUpdate::class);
     }
 
     /**
@@ -116,7 +119,7 @@ public function processAuthenticationFailure($customerId)
         }
 
         $customerSecure->setFailuresNum($failuresNum);
-        $this->getCustomerAuthUpdate()->saveAuth($customerId);
+        $this->customerAuthUpdate->saveAuth($customerId);
     }
 
     /**
@@ -128,7 +131,7 @@ public function unlock($customerId)
         $customerSecure->setFailuresNum(0);
         $customerSecure->setFirstFailure(null);
         $customerSecure->setLockExpires(null);
-        $this->getCustomerAuthUpdate()->saveAuth($customerId);
+        $this->customerAuthUpdate->saveAuth($customerId);
     }
 
     /**
@@ -176,19 +179,4 @@ public function authenticate($customerId, $password)
         }
         return true;
     }
-
-    /**
-     * Get customer authentication update model
-     *
-     * @return \Magento\Customer\Model\CustomerAuthUpdate
-     * @deprecated 100.1.1
-     */
-    private function getCustomerAuthUpdate()
-    {
-        if ($this->customerAuthUpdate === null) {
-            $this->customerAuthUpdate =
-                \Magento\Framework\App\ObjectManager::getInstance()->get(CustomerAuthUpdate::class);
-        }
-        return $this->customerAuthUpdate;
-    }
 }

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

@@ -26,23 +26,23 @@ class CustomerAuthUpdate
     protected $customerResourceModel;
 
     /**
-     * @var Customer
+     * @var CustomerFactory
      */
-    private $customerModel;
+    private $customerFactory;
 
     /**
      * @param CustomerRegistry $customerRegistry
      * @param CustomerResourceModel $customerResourceModel
-     * @param Customer|null $customerModel
+     * @param CustomerFactory|null $customerFactory
      */
     public function __construct(
         CustomerRegistry $customerRegistry,
         CustomerResourceModel $customerResourceModel,
-        Customer $customerModel = null
+        CustomerFactory $customerFactory = null
     ) {
         $this->customerRegistry = $customerRegistry;
         $this->customerResourceModel = $customerResourceModel;
-        $this->customerModel = $customerModel ?: ObjectManager::getInstance()->get(Customer::class);
+        $this->customerFactory = $customerFactory ?: ObjectManager::getInstance()->get(CustomerFactory::class);
     }
 
     /**
@@ -55,9 +55,9 @@ public function __construct(
     public function saveAuth($customerId)
     {
         $customerSecure = $this->customerRegistry->retrieveSecureData($customerId);
-
-        $this->customerResourceModel->load($this->customerModel, $customerId);
-        $currentLockExpiresVal = $this->customerModel->getData('lock_expires');
+        $customerModel = $this->customerFactory->create();
+        $this->customerResourceModel->load($customerModel, $customerId);
+        $currentLockExpiresVal = $customerModel->getData('lock_expires');
         $newLockExpiresVal = $customerSecure->getData('lock_expires');
 
         $this->customerResourceModel->getConnection()->update(
@@ -71,7 +71,7 @@ public function saveAuth($customerId)
         );
 
         if ($currentLockExpiresVal !== $newLockExpiresVal) {
-            $this->customerModel->reindex();
+            $customerModel->reindex();
         }
 
         return $this;

app/code/Magento/CustomerGraphQl/etc/graphql/events.xml

@@ -10,4 +10,7 @@
     <event name="customer_login">
         <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
     </event>
+    <event name="customer_customer_authenticated">
+        <observer name="customer_unlock" instance="Magento\Customer\Observer\CustomerLoginSuccessObserver" />
+    </event>
 </config>

app/code/Magento/Integration/etc/webapi_rest/events.xml

@@ -9,4 +9,7 @@
     <event name="customer_login">
         <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
     </event>
+    <event name="customer_customer_authenticated">
+        <observer name="customer_unlock" instance="Magento\Customer\Observer\CustomerLoginSuccessObserver" />
+    </event>
 </config>

app/code/Magento/Integration/etc/webapi_soap/events.xml

@@ -9,4 +9,7 @@
     <event name="customer_login">
         <observer name="customer_log_login" instance="Magento\Customer\Observer\LogLastLoginAtObserver" />
     </event>
+    <event name="customer_customer_authenticated">
+        <observer name="customer_unlock" instance="Magento\Customer\Observer\CustomerLoginSuccessObserver" />
+    </event>
 </config>