Allow turnstile to pass when disabled

njoguamos · Feb 11, 2024 · 8468a6c · 8468a6c
1 parent ab28a69
commit 8468a6c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/Rules/TurnstileRule.php b/src/Rules/TurnstileRule.php
@@ -12,7 +12,7 @@ class TurnstileRule implements ValidationRule
 {
     public function validate(string $attribute, mixed $value, Closure $fail): void
     {
-        if (! (new Turnstile())->validate(token: $value)) {
+        if (config(key: 'turnstile.enabled') && ! (new Turnstile())->validate(token: $value)) {
             $fail(trans(key: 'turnstile::turnstile.failed'));
         }
     }

diff --git a/tests/Http/MiddleWare/TurnstileMiddlewareTest.php b/tests/Http/MiddleWare/TurnstileMiddlewareTest.php
@@ -4,7 +4,8 @@
 use NjoguAmos\Turnstile\Http\Middleware\TurnstileMiddleware;
 use Symfony\Component\HttpFoundation\Response;
 
-test(description: 'it skips the middleware when disabled', closure: function () {
+it(description: 'skips the middleware when disabled', closure: function () {
+    config()->set(key: 'turnstile.secretkey', value: null);
     config()->set(key: 'turnstile.enabled', value: false);
 
     $response = (new TurnstileMiddleware())
@@ -16,7 +17,7 @@
     expect(value: $response->isRedirect())->toBeFalse();
 });
 
-test(description: 'it redirects back the request if the token is invalid', closure: function () {
+it(description: 'redirects back the request if the token is invalid', closure: function () {
     setSecretKey(type: 'invalid');
 
     $response = (new TurnstileMiddleware())
@@ -34,7 +35,7 @@
         ->toBe(expected: trans(key: 'turnstile::turnstile.failed'));
 });
 
-test(description: 'it redirects back the request if the token is already spent', closure: function () {
+it(description: 'redirects back the request if the token is already spent', closure: function () {
     setSecretKey(type: 'spent');
 
     $response = (new TurnstileMiddleware())
@@ -52,7 +53,7 @@
         ->toBe(expected: trans(key: 'turnstile::turnstile.failed'));
 });
 
-test(description: 'it allows the request to pass when the token is valid', closure: function () {
+it(description: 'allows the request to pass when the token is valid', closure: function () {
     setSecretKey(type: 'valid');
 
     $response = (new TurnstileMiddleware())
@@ -70,7 +71,7 @@
         ->and(value: $response->isSuccessful())->toBeTrue();
 });
 
-test(description: 'it redirects back the request if the token is null', closure: function () {
+it(description: 'redirects back the request if the token is null', closure: function () {
     setSecretKey(type: 'valid');
 
     $response = (new TurnstileMiddleware())

diff --git a/tests/Rules/TurnstileRuleTest.php b/tests/Rules/TurnstileRuleTest.php
@@ -28,3 +28,10 @@
 
     expect(value:$this->rule)->not->toPassWith('DUMMY.TOKEN');
 });
+
+it(description: 'passes when turnstile is disable', closure: function () {
+    config()->set('turnstile.secretkey', null);
+    config()->set('turnstile.enabled', false);
+
+    expect(value:$this->rule)->toPassWith('');
+});