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

Author: glo23503

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

@@ -1415,5 +1415,9 @@ public function getPassword()
     public function _resetState(): void
     {
         $this->_errors = [];
+        $this->_origData = null;
+        $this->storedData = [];
+        $this->_data = [];
+
     }
 }

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php

@@ -19,6 +19,7 @@
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\Helper\Bootstrap;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Customer\Model\CustomerFactory;
 
 /**
  * API-functional tests cases for generateCustomerToken mutation
@@ -30,13 +31,19 @@ class GenerateCustomerTokenTest extends GraphQlAbstract
      */
     private $logger;
 
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
         parent::setUp();
         $this->logger = Bootstrap::getObjectManager()->get(Logger::class);
+        $this->customerFactory = Bootstrap::getObjectManager()->get(CustomerFactory::class);
     }
 
     /**
@@ -46,9 +53,23 @@ protected function setUp(): void
      */
     public function testGenerateCustomerValidToken(): void
     {
+        $mutation = $this->getQuery('customer@example.com', 'wrongpassword');
+        try {
+            $response = $this->graphQlMutation($mutation);
+        } catch (\Exception $e) {
+        }
+        $customer = $this->customerFactory->create()->setWebsiteId(1)
+            ->loadByEmail('customer@example.com');
+        $this->assertEquals(1, $customer->getFailuresNum());
+        $this->assertNotNull($customer->getFirstFailure());
+
         $mutation = $this->getQuery();
 
         $response = $this->graphQlMutation($mutation);
+        $customer = $this->customerFactory->create()->setWebsiteId(1)
+            ->loadByEmail('customer@example.com');
+        $this->assertEquals(0, $customer->getFailuresNum());
+        $this->assertNull($customer->getFirstFailure());
         $this->assertArrayHasKey('generateCustomerToken', $response);
         $this->assertIsArray($response['generateCustomerToken']);
     }

dev/tests/api-functional/testsuite/Magento/Integration/Model/CustomerTokenServiceTest.php

@@ -18,6 +18,7 @@
 use Magento\Integration\Model\ResourceModel\Oauth\Token\CollectionFactory;
 use Magento\Integration\Model\Oauth\Token\RequestLog\Config as TokenThrottlerConfig;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
+use Magento\Customer\Model\CustomerFactory;
 
 /**
  * api-functional test for \Magento\Integration\Model\CustomerTokenService.
@@ -26,9 +27,9 @@
  */
 class CustomerTokenServiceTest extends WebapiAbstract
 {
-    const SERVICE_NAME = "integrationCustomerTokenServiceV1";
-    const SERVICE_VERSION = "V1";
-    const RESOURCE_PATH_CUSTOMER_TOKEN = "/V1/integration/customer/token";
+    private const SERVICE_NAME = "integrationCustomerTokenServiceV1";
+    private const SERVICE_VERSION = "V1";
+    private const RESOURCE_PATH_CUSTOMER_TOKEN = "/V1/integration/customer/token";
 
     /**
      * @var CustomerTokenServiceInterface
@@ -60,6 +61,11 @@ class CustomerTokenServiceTest extends WebapiAbstract
      */
     private $tokenReader;
 
+    /**
+     * @var CustomerFactory
+     */
+    private $customerFactory;
+
     /**
      * Setup CustomerTokenService
      */
@@ -81,6 +87,7 @@ protected function setUp(): void
         $tokenThrottlerConfig = Bootstrap::getObjectManager()->get(TokenThrottlerConfig::class);
         $this->attemptsCountToLockAccount = $tokenThrottlerConfig->getMaxFailuresCount();
         $this->tokenReader = Bootstrap::getObjectManager()->get(UserTokenReaderInterface::class);
+        $this->customerFactory = Bootstrap::getObjectManager()->get(CustomerFactory::class);
     }
 
     /**
@@ -103,9 +110,26 @@ public function testCreateCustomerAccessToken(?string $store): void
                 'httpMethod' => Request::HTTP_METHOD_POST,
             ],
         ];
+
+        $invalidCredentials = [
+            'username' => $userName,
+            'password' => 'invalid',
+        ];
+        try {
+            $this->_webApiCall($serviceInfo, $invalidCredentials);
+        } catch (\Exception $e) {
+        }
+        $customerData = $this->customerAccountManagement->authenticate($userName, $password);
+        $customer = $this->customerFactory->create()->setWebsiteId($customerData->getWebsiteId())
+            ->loadByEmail($customerData->getEmail());
+        $this->assertEquals(1, $customer->getFailuresNum());
+        $this->assertNotNull($customer->getFirstFailure());
         $requestData = ['username' => $userName, 'password' => $password];
         $accessToken = $this->_webApiCall($serviceInfo, $requestData, null, $store);
-
+        $customer = $this->customerFactory->create()->setWebsiteId($customerData->getWebsiteId())
+            ->loadByEmail($customerData->getEmail());
+        $this->assertEquals(0, $customer->getFailuresNum());
+        $this->assertNull($customer->getFirstFailure());
         $this->assertToken($accessToken, $userName, $password);
     }