1.x

Author: DarkGhostHunter

README.md

@@ -0,0 +1,10 @@
+<?php
+
+namespace Laragear\Turnstile\Enums;
+
+enum SecretKey: string
+{
+    case Passing = '1x0000000000000000000000000000000AA';
+    case Fails = '2x0000000000000000000000000000000AA';
+    case Spent = '3x0000000000000000000000000000000AA';
+}

src/Enums/SecretKey.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Laragear\Turnstile\Enums;
+
+enum SiteKey: string
+{
+    case VisiblePassing = '1x00000000000000000000AA';
+    case VisibleBlocks = '2x00000000000000000000AB';
+    case InvisiblePassing = '1x00000000000000000000BB';
+    case InvisibleBlocks = '2x00000000000000000000BB';
+    case ForceInteraction = '3x00000000000000000000FF';
+}

src/Enums/SiteKey.php

@@ -8,6 +8,8 @@
  * @method static \Laragear\Turnstile\Challenge getChallenge(string $token, string $ip = '', string $idempotencyKey = '', array $options = [], bool $save = true)
  * @method static \Laragear\Turnstile\Challenge getChallengeFromRequest(\Illuminate\Http\Request|null $request = null, string $key = '', string $idempotencyKey = '', array $options = [], bool $store = true)
  * @method static \Laragear\Turnstile\Challenge challenge()
+ * @method static \Laragear\Turnstile\Turnstile useTestingSiteKey(\Laragear\Turnstile\Enums\SiteKey $key)
+ * @method static \Laragear\Turnstile\Turnstile useTestingSecretKey(\Laragear\Turnstile\Enums\SecretKey $key)
  * @method static string key()
  * @method static string rule()
  * @method static array rules()

src/Facades/Turnstile.php

@@ -9,13 +9,8 @@
 use Illuminate\Support\Str;
 use Illuminate\Validation\ValidationException;
 use Laragear\Turnstile\Turnstile;
-use function array_map;
-use function array_pad;
 use function explode;
-use function implode;
-use function in_array;
 use function is_string;
-use function trim;
 
 /**
  * @method static \Laragear\Turnstile\Http\Middleware\TurnstileMiddlewareDefinition auth($guards = null)

src/Http/Middleware/TurnstileMiddleware.php

@@ -5,7 +5,6 @@
 use Illuminate\Support\Arr;
 use Stringable;
 use function implode;
-use function in_array;
 
 class TurnstileMiddlewareDefinition implements Stringable
 {

src/Http/Middleware/TurnstileMiddlewareDefinition.php

@@ -12,6 +12,8 @@
 use Illuminate\Http\Client\ResponseSequence;
 use Illuminate\Http\Request;
 use Illuminate\Support\DateFactory;
+use Laragear\Turnstile\Enums\SecretKey;
+use Laragear\Turnstile\Enums\SiteKey;
 use Laragear\Turnstile\Exceptions\InvalidChallengeException;
 use function array_filter;
 use function array_merge;
@@ -37,20 +39,6 @@ class Turnstile
      */
     public const KEY = 'cf-turnstile-response';
 
-    /**
-     * Testing site key that always resolves to true
-     *
-     * @const string
-     */
-    public const SITE_KEY = '1x00000000000000000000AA';
-
-    /**
-     * Testing secret key that always returns successful challenges.
-     *
-     * @const string
-     */
-    public const SECRET_KEY = '1x0000000000000000000000000000000AA';
-
     /**
      * The Cloudflare Turnstile Site Verify endpoint.
      *
@@ -73,12 +61,37 @@ public function __construct(
         protected readonly Factory $http,
         protected readonly Repository $config,
         protected readonly DateFactory $date,
+        protected Enums\SiteKey $testingSiteKey = SiteKey::VisiblePassing,
+        protected Enums\SecretKey $testingSecretKey = SecretKey::Passing,
         protected array $fakedResponse = [],
         protected bool $shouldFake = false
     ) {
         // ...
     }
 
+    /**
+     * Use the given Testing Site Key for rendering challenges on the frontend.
+     *
+     * @return $this
+     */
+    public function useTestingSiteKey(SiteKey $key): static
+    {
+        $this->testingSiteKey = $key;
+
+        return $this;
+    }
+
+    /**
+     * USe the given Testing Secret Key for retrieving challenges from the backend.
+     * @return $this
+     */
+    public function useTestingSecretKey(SecretKey $key): static
+    {
+        $this->testingSecretKey = $key;
+
+        return $this;
+    }
+
     /**
      * Returns the default key to use to check Cloudflare Turnstile responses.
      */
@@ -162,7 +175,6 @@ public function getChallenge(
     /**
      * Retrieves the Challenge response from Turnstile servers.
      *
-     * @throws \Illuminate\Contracts\Container\BindingResolutionException
      * @throws \Illuminate\Http\Client\ConnectionException
      * @throws \Illuminate\Http\Client\RequestException
      */
@@ -176,7 +188,7 @@ protected function getResponse(string $token, string $ip, string $idempotencyKey
             ->asJson()
             ->acceptJson()
             ->withOptions(array_merge($this->config->get('turnstile.client'), $options))
-            ->post(static::ENDPOINT, array_filter([ // @phpstan-ignore-line
+            ->post(static::ENDPOINT, array_filter([
                 'secret' => $this->getSecretKey(),
                 'response' => $token,
                 'remoteip' => $ip,
@@ -256,7 +268,7 @@ public function getSiteKey(): string
         $key = $this->config->get('turnstile.site_key');
 
         if ($this->currentEnvironment() !== 'production') {
-            $key ??= static::SITE_KEY;
+            $key ??= $this->testingSiteKey->value;
         }
 
         return $key;
@@ -270,7 +282,7 @@ protected function getSecretKey(): string
         $key = $this->config->get('turnstile.secret_key');
 
         if ($this->currentEnvironment() !== 'production') {
-            $key ??= static::SECRET_KEY;
+            $key ??= $this->testingSecretKey->value;
         }
 
         return $key;
@@ -309,7 +321,7 @@ public function missingChallenge(): bool
      */
     public function flushChallenge(): void
     {
-        $this->container->instance(Challenge::class, null);
+        unset($this->container[Challenge::class]); // @phpstan-ignore-line
     }
 
     /**

src/Turnstile.php

@@ -4,8 +4,6 @@
 
 use Illuminate\Contracts\Foundation\Application;
 use Illuminate\Contracts\Validation\Factory as ValidatorFactory;
-use Illuminate\Http\Client\Factory;
-use Illuminate\Http\Request;
 use Illuminate\Routing\Router;
 use Illuminate\Support\ServiceProvider;
 use Illuminate\View\Compilers\BladeCompiler;
@@ -31,7 +29,7 @@ public function register(): void
 
         // Remove the challenge when the application lifecycle ends.
         $this->app->terminating(static function (Application $app) {
-            $app->instance(Challenge::class, null);
+            unset($app[Challenge::class]);
         });
     }
 
@@ -45,7 +43,6 @@ public function boot(Router $router): void
         );
 
         if ($this->app->runningInConsole()) {
-            // @phpstan-ignore-next-line
             $this->publishes([static::CONFIG => $this->app->configPath('turnstile.php')], 'config');
             $this->publishes([static::LANG => $this->app->langPath('vendor/turnstile')], 'lang');
         }

src/TurnstileServiceProvider.php

@@ -9,7 +9,6 @@
 use Laragear\Turnstile\Turnstile;
 use Stringable;
 use function array_pad;
-use function blank;
 use function in_array;
 use function is_string;
 

src/Validation/TurnstileRule.php

@@ -22,7 +22,7 @@ class Script extends Component
     public function __construct(
         protected Turnstile $turnstile,
         public bool $explicit = false,
-        public string $onload = '',
+        public ?string $onload = null,
         public bool $async = true,
         public bool $defer = true,
     )