Merge pull request #25 from sprankhub/verification-response-processing

Verification response processing

Model/Validate.php

@@ -9,6 +9,7 @@
 namespace IMI\FriendlyCaptcha\Model;
 
 use IMI\FriendlyCaptcha\Api\ValidateInterface;
+use Magento\Framework\HTTP\Client\Curl;
 use Magento\Framework\HTTP\Client\CurlFactory;
 use Magento\Framework\Serialize\Serializer\Json;
 use Psr\Log\LoggerInterface;
@@ -81,7 +82,7 @@ public function validate(string $friendlyCaptchaSolution): bool
             $curl->post($this->getSiteVerifyUrl(), $parameters);
             $response = $this->serializer->unserialize($curl->getBody());
 
-            if ($curl->getStatus() === 200) {
+            if ($this->shouldUseResponse($curl, $response)) {
                 return $response['success'];
             } else {
                 $this->logger->error('Error validating captcha solution.', ['response' => var_export($response, true)]);
@@ -93,12 +94,22 @@ public function validate(string $friendlyCaptchaSolution): bool
         return true;
     }
 
-    public function getSiteVerifyUrl(): string
+    private function getSiteVerifyUrl(): string
     {
         if ($this->config->useEuEndpoint()) {
             return 'https://eu-api.friendlycaptcha.eu/api/v1/siteverify';
         }
 
         return 'https://api.friendlycaptcha.com/api/v1/siteverify';
     }
+
+    private function shouldUseResponse(Curl $curl, $response): bool
+    {
+        $isResponseOk = $curl->getStatus() === 200;
+        $isSolutionMissingOrBadRequest = $curl->getStatus() === 400
+            && isset($response['success'], $response['errors'])
+            && array_intersect($response['errors'], ['solution_missing', 'bad_request']);
+
+        return $isResponseOk || $isSolutionMissingOrBadRequest;
+    }
 }