MC-5602: CAPTCHA doesn't appear in login popup after refreshing page.

omiroshnichenko · omiroshnichenko · commit 583c88a51558 · 2018-12-04T11:05:29.000-06:00
- fix login issue with correct user credentials
diff --git a/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php b/app/code/Magento/Captcha/Model/Customer/Plugin/AjaxLogin.php
@@ -98,13 +98,14 @@ public function aroundExecute(
         foreach ($this->formIds as $formId) {
             if ($formId === $loginFormId) {
                 $captchaModel = $this->helper->getCaptcha($formId);
-                $captchaModel->logAttempt($username);
                 if ($captchaModel->isRequired($username)) {
                     if (!$captchaModel->isCorrect($captchaString)) {
                         $this->sessionManager->setUsername($username);
+                        $captchaModel->logAttempt($username);
                         return $this->returnJsonError(__('Incorrect CAPTCHA'));
                     }
                 }
+                $captchaModel->logAttempt($username);
             }
         }
         return $proceed();

Original file line number	Diff line number	Diff line change
`@@ -98,13 +98,14 @@ public function aroundExecute(`
`98`	`98`	`foreach ($this->formIds as $formId) {`
`99`	`99`	`if ($formId === $loginFormId) {`
`100`	`100`	`$captchaModel = $this->helper->getCaptcha($formId);`
`101`		`- $captchaModel->logAttempt($username);`
`102`	`101`	`if ($captchaModel->isRequired($username)) {`
`103`	`102`	`if (!$captchaModel->isCorrect($captchaString)) {`
`104`	`103`	`$this->sessionManager->setUsername($username);`
	`104`	`+ $captchaModel->logAttempt($username);`
`105`	`105`	`return $this->returnJsonError(__('Incorrect CAPTCHA'));`
`106`	`106`	`}`
`107`	`107`	`}`
	`108`	`+ $captchaModel->logAttempt($username);`
`108`	`109`	`}`
`109`	`110`	`}`
`110`	`111`	`return $proceed();`