[bugfix] catch different response attribute for prosopo method, resolves

#25
thomasrawiel · Dec 2, 2024 · 82592ac · 82592ac
1 parent baa82b3
commit 82592ac
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/Classes/Domain/Validator/SpamShield/CaptchaMethod.php b/Classes/Domain/Validator/SpamShield/CaptchaMethod.php
@@ -28,6 +28,9 @@ class CaptchaMethod extends AbstractMethod
      */
     protected string $captchaMethod = '';
 
+    /**
+     * @var array|array[]
+     */
     protected array $captchaConfiguration = [
         'recaptcha' => [
             'siteVerifyUri' => 'https://www.google.com/recaptcha/api/siteverify',
@@ -134,7 +137,7 @@ protected function verifyCaptchaResponse(): bool
 
         $result = \json_decode($jsonResult);
 
-        return (bool)$result->success;
+        return $this->getExpextedResponseAttribute($result);
     }
 
     /**
@@ -219,6 +222,22 @@ protected function getActionName(): string
         return $pluginVariables['action'] ?? '';
     }
 
+    /**
+     * @param array|\stdClass $result
+     *
+     * @return bool
+     */
+    protected function getExpextedResponseAttribute(array|\stdClass $result): bool {
+        if($this->configuration['captchaMethod'] === 'procaptcha') {
+            return $result->status === 'ok' && $result->verified;
+        }
+
+        return (bool)$result->success;
+    }
+
+    /**
+     * @return RequestInterface|null
+     */
     protected function getRequest(): ?RequestInterface
     {
         return $GLOBALS['TYPO3_REQUEST'] ?? null;

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -8,7 +8,7 @@
     'author_email' => 'thomas.rawiel@gmail.com',
     'state' => 'stable',
     'clearCacheOnLoad' => 0,
-    'version' => '2.1.1',
+    'version' => '2.1.2',
     'constraints' => [
         'depends' => [
             'typo3' => '12.4.0-12.4.99',