Merge pull request #166 from magento/after-review-refactoring

security-package/pull/146: Refactoring after Code Review

Author: naydav

ReCaptchaCustomer/Model/AjaxLogin/CaptchaResponseResolver.php

@@ -32,7 +32,7 @@ public function __construct(SerializerInterface $serializer)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      *
      * @param RequestInterface|PlainTextRequestInterface $request
      * @return string

ReCaptchaValidation/Model/Validator.php

@@ -12,6 +12,7 @@
 use Magento\ReCaptchaValidationApi\Api\Data\ValidationConfigInterface;
 use Magento\ReCaptchaValidationApi\Api\ValidatorInterface;
 use Magento\ReCaptchaValidationApi\Model\ErrorMessagesProvider;
+use ReCaptcha\ReCaptcha;
 use ReCaptcha\ReCaptchaFactory;
 
 /**
@@ -56,21 +57,22 @@ public function isValid(
         string $reCaptchaResponse,
         ValidationConfigInterface $validationConfig
     ): ValidationResult {
-        $secret = $validationConfig->getPrivateKey();
-        $reCaptcha = $this->reCaptchaFactory->create(['secret' => $secret]);
+        /** @var ReCaptcha $reCaptcha */
+        $reCaptcha = $this->reCaptchaFactory->create(['secret' => $validationConfig->getPrivateKey()]);
+
         $extensionAttributes = $validationConfig->getExtensionAttributes();
         if ($extensionAttributes && (null !== $extensionAttributes->getScoreThreshold())) {
             $reCaptcha->setScoreThreshold($extensionAttributes->getScoreThreshold());
         }
+
         $result = $reCaptcha->verify($reCaptchaResponse, $validationConfig->getRemoteIp());
 
         $validationErrors = [];
-        if (!$result->isSuccess()) {
+        if (false === $result->isSuccess()) {
             foreach ($result->getErrorCodes() as $errorCode) {
                 $validationErrors[] = $this->errorMessagesProvider->getErrorMessage($errorCode);
             }
         }
-
         return $this->validationResultFactory->create(['errors' => $validationErrors]);
     }
 }