log + translations

Author: aguingand

config/captcha.php

@@ -10,4 +10,6 @@
             'secret_key' => env('CAPTCHA_TURNSTILE_SECRET_KEY', ''),
         ],
     ],
+    'log_channel' => env('CAPTCHA_LOG_CHANNEL'),
+    'log_verification_errors' => env('CAPTCHA_LOG_VERIFICATION_ERRORS', true),
 ];

resources/lang/de/errors.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'required' => 'Das Captcha muss vor dem Absenden des Formulars validiert werden.',
+    'verification_failed' => 'Bei der Überprüfung des Captchas ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.',
+];

resources/lang/en/errors.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'required' => 'The captcha must be validated before submitting the form.',
+    'verification_failed' => 'An error occurred during captcha verification. Please try again later.',
+];

resources/lang/es/errors.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'required' => 'El captcha debe ser validado antes de enviar el formulario.',
+    'verification_failed' => 'Se ha producido un error durante la verificación del captcha. Por favor, inténtelo de nuevo más tarde.',
+];

resources/lang/fr/errors.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'required' => 'Le captcha doit être validé avant d’envoyer le formulaire.',
+    'verification_failed' => 'Une erreur est survenue lors de la vérification du captcha. Veuillez réessayer plus tard.',
+];

resources/lang/it/errors.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'required' => 'Il captcha deve essere convalidato prima di inviare il modulo.',
+    'verification_failed' => 'Si è verificato un errore durante la verifica del captcha. Riprova più tardi.',
+];

src/CaptchaServiceProvider.php

@@ -17,6 +17,7 @@ public function configurePackage(Package $package): void
         $package
             ->name('laravel-captcha')
             ->hasConfigFile()
+            ->hasTranslations()
             ->hasViews('captcha');
     }
 

src/Providers/Turnstile/TurnstileClient.php

@@ -3,6 +3,8 @@
 namespace Code16\Captcha\Providers\Turnstile;
 
 use Code16\Captcha\Contracts\ClientInterface;
+use Illuminate\Http\Client\RequestException;
+use Illuminate\Support\Facades\Context;
 use RyanChandler\LaravelCloudflareTurnstile\Client;
 use RyanChandler\LaravelCloudflareTurnstile\Responses\SiteverifyResponse;
 
@@ -14,6 +16,12 @@ public function __construct(protected string $secret)
 
     public function verify(string $token): SiteverifyResponse
     {
-        return new Client($this->secret)->siteverify($token);
+        try {
+            return new Client($this->secret)->siteverify($token);
+        } catch (RequestException $exception) {
+            Context::add('response', $exception->response);
+
+            return SiteverifyResponse::failure($exception->response->json('error-codes', ['unknown']));
+        }
     }
 }

src/Providers/Turnstile/TurnstileRule.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Code16\Captcha\Providers\Turnstile;
+
+use Closure;
+use Code16\Captcha\Facades\Captcha;
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Facades\Log;
+use RyanChandler\LaravelCloudflareTurnstile\Responses\SiteverifyResponse;
+
+class TurnstileRule implements ValidationRule
+{
+    protected array $messages = [];
+
+    public function validate(string $attribute, mixed $value, Closure $fail): void
+    {
+        /**
+         * @var SiteverifyResponse $response
+         */
+        $response = Captcha::verify($value);
+
+        if ($response->success) {
+            return;
+        }
+
+        if (count($response->errorCodes)) {
+            if (config('captcha.log_verification_errors')) {
+                Log::channel(config('captcha.log_channel'))->error('Captcha verification API failed', [
+                    'provider' => 'turnstile',
+                    'errorCodes' => $response->errorCodes,
+                ]);
+            }
+            $fail(__('captcha::errors.verification_failed'));
+        }
+    }
+}

src/Rules/Captcha.php

@@ -3,9 +3,9 @@
 namespace Code16\Captcha\Rules;
 
 use Closure;
+use Code16\Captcha\Providers\Turnstile\TurnstileRule;
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Support\Facades\Validator;
-use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 
 class Captcha implements ValidationRule
 {
@@ -23,9 +23,12 @@ public function validate(string $attribute, mixed $value, Closure $fail): void
                 $attribute => [
                     'required',
                     match (config('captcha.provider')) {
-                        'turnstile' => new Turnstile(),
+                        'turnstile' => new TurnstileRule(),
                     },
                 ],
+            ],
+            [
+                "$attribute.required" => __('captcha::errors.required'),
             ]
         );