Merge pull request #60 from aryehraber/response-selector-tag

Add `{{ captcha:selector }}` Tag
aryehraber · Nov 29, 2024 · 2614948 · 2614948
2 parents bc86b27 + 16b5aa2
commit 2614948
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 3 deletions.
diff --git a/src/Altcha.php b/src/Altcha.php
@@ -11,6 +11,11 @@ public function getResponseToken()
         return request('altcha-payload');
     }
 
+    public function getResponseSelector()
+    {
+        return '#altcha-widget input[name=altcha]';
+    }
+
     public function getVerificationUrl()
     {
         return null;
@@ -37,7 +42,8 @@ public function renderHeadTag()
 
     public function verify()
     {
-        $payload = json_decode(base64_decode($this->getResponseToken()), true);
+        $responseToken = $this->getResponseToken() ?: request('captcha-response');
+        $payload = json_decode(base64_decode($responseToken), true);
 
         if ($payload) {
             $challenge = $this->createChallenge($payload['salt'], $payload['number']);

diff --git a/src/Captcha.php b/src/Captcha.php
@@ -19,6 +19,8 @@ public function __construct()
 
     abstract public function getResponseToken();
 
+    abstract public function getResponseSelector();
+
     abstract public function getVerificationUrl();
 
     abstract public function getDefaultDisclaimer();
@@ -31,7 +33,7 @@ public function verify()
     {
         $params = [
             'secret' => $this->getSecret(),
-            'response' => $this->getResponseToken(),
+            'response' => $this->getResponseToken() ?: request('captcha-response'),
             'remoteip' => request()->ip(),
         ];
 

diff --git a/src/CaptchaTags.php b/src/CaptchaTags.php
@@ -2,8 +2,8 @@
 
 namespace AryehRaber\Captcha;
 
-use Statamic\Tags\Tags;
 use Statamic\Support\Html;
+use Statamic\Tags\Tags;
 
 class CaptchaTags extends Tags
 {
@@ -36,6 +36,16 @@ public function head()
         return $this->captcha->renderHeadTag();
     }
 
+    /**
+     * The {{ captcha:selector }} tag
+     *
+     * @return string
+     */
+    public function selector()
+    {
+        return $this->captcha->getResponseSelector();
+    }
+
     /**
      * The {{ captcha:disclaimer }} tag
      *

diff --git a/src/Hcaptcha.php b/src/Hcaptcha.php
@@ -11,6 +11,11 @@ public function getResponseToken()
         return request('h-captcha-response');
     }
 
+    public function getResponseSelector()
+    {
+        return '.h-captcha textarea[name=h-captcha-response]';
+    }
+
     public function getVerificationUrl()
     {
         return 'https://hcaptcha.com/siteverify';

diff --git a/src/Recaptcha.php b/src/Recaptcha.php
@@ -11,6 +11,11 @@ public function getResponseToken()
         return request('g-recaptcha-response');
     }
 
+    public function getResponseSelector()
+    {
+        return '.g-recaptcha textarea[name=g-recaptcha-response]';
+    }
+
     public function getVerificationUrl()
     {
         return 'https://www.google.com/recaptcha/api/siteverify';

diff --git a/src/Turnstile.php b/src/Turnstile.php
@@ -11,6 +11,11 @@ public function getResponseToken()
         return request('cf-turnstile-response');
     }
 
+    public function getResponseSelector()
+    {
+        return '.cf-turnstile input[name=cf-turnstile-response]';
+    }
+
     public function getVerificationUrl()
     {
         return 'https://challenges.cloudflare.com/turnstile/v0/siteverify';