From e54a63ee09045c4b1fe2540b6b4092eaaeb82a07 Mon Sep 17 00:00:00 2001
From: Jose Ortega <joc.hhop@gmail.com>
Date: Wed, 25 Jul 2018 14:27:50 +0200
Subject: [PATCH] Refactored multiples conditions which could be grouped in a
 single one in captcha observers

---
 .../Observer/CheckGuestCheckoutObserver.php   | 17 +++++++-------
 .../CheckRegisterCheckoutObserver.php         | 17 +++++++-------
 ...CheckUserForgotPasswordBackendObserver.php | 23 +++++++++----------
 .../CheckUserLoginBackendObserver.php         | 10 ++++----
 4 files changed, 32 insertions(+), 35 deletions(-)

diff --git a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
index 40c215ec218a1..7ccaa76b6c7c8 100644
--- a/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckGuestCheckoutObserver.php
@@ -66,15 +66,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'guest_checkout';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
-        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST) {
-            if ($captchaModel->isRequired()) {
-                $controller = $observer->getControllerAction();
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
-                    $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
-                }
+        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_GUEST
+            && $captchaModel->isRequired()
+        ) {
+            $controller = $observer->getControllerAction();
+            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
+                $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+                $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
+                $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
             }
         }
 
diff --git a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
index 3bf2ac38debee..8e110a9f4653d 100644
--- a/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckRegisterCheckoutObserver.php
@@ -66,15 +66,14 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'register_during_checkout';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $checkoutMethod = $this->_typeOnepage->getQuote()->getCheckoutMethod();
-        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER) {
-            if ($captchaModel->isRequired()) {
-                $controller = $observer->getControllerAction();
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
-                    $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
-                }
+        if ($checkoutMethod == \Magento\Checkout\Model\Type\Onepage::METHOD_REGISTER
+            && $captchaModel->isRequired()
+        ) {
+            $controller = $observer->getControllerAction();
+            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))) {
+                $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+                $result = ['error' => 1, 'message' => __('Incorrect CAPTCHA')];
+                $controller->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
             }
         }
 
diff --git a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
index 402fc028c5ad0..2de93dcf6b59b 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserForgotPasswordBackendObserver.php
@@ -69,18 +69,17 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $controller = $observer->getControllerAction();
         $email = (string)$observer->getControllerAction()->getRequest()->getParam('email');
         $params = $observer->getControllerAction()->getRequest()->getParams();
-        if (!empty($email) && !empty($params)) {
-            if ($captchaModel->isRequired()) {
-                if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
-                ) {
-                    $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
-                    $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
-                    $this->messageManager->addError(__('Incorrect CAPTCHA'));
-                    $controller->getResponse()->setRedirect(
-                        $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
-                    );
-                }
-            }
+        if (!empty($email)
+            && !empty($params)
+            && $captchaModel->isRequired()
+            && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($controller->getRequest(), $formId))
+        ) {
+            $this->_session->setEmail((string)$controller->getRequest()->getPost('email'));
+            $this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
+            $this->messageManager->addError(__('Incorrect CAPTCHA'));
+            $controller->getResponse()->setRedirect(
+                $controller->getUrl('*/*/forgotpassword', ['_nosecret' => true])
+            );
         }
 
         return $this;
diff --git a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
index 8cc907d7bd12b..924514cd48c5d 100644
--- a/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
+++ b/app/code/Magento/Captcha/Observer/CheckUserLoginBackendObserver.php
@@ -52,11 +52,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $formId = 'backend_login';
         $captchaModel = $this->_helper->getCaptcha($formId);
         $login = $observer->getEvent()->getUsername();
-        if ($captchaModel->isRequired($login)) {
-            if (!$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->_request, $formId))) {
-                $captchaModel->logAttempt($login);
-                throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
-            }
+        if ($captchaModel->isRequired($login)
+            && !$captchaModel->isCorrect($this->captchaStringResolver->resolve($this->_request, $formId))
+        ) {
+            $captchaModel->logAttempt($login);
+            throw new PluginAuthenticationException(__('Incorrect CAPTCHA.'));
         }
         $captchaModel->logAttempt($login);