chore: Change to vendor recommended implementation

Author: matiasperrone-exo

app/Http/Controllers/Auth/EmailVerificationController.php

@@ -13,6 +13,7 @@
  **/
 use App\Http\Controllers\Controller;
 use App\libs\Utils\EmailUtils;
+use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 use App\Services\Auth\IUserService;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Redirect;
@@ -87,7 +88,7 @@ protected function validator(array $data)
     {
         return Validator::make($data, [
             'email'                    => 'required|string|email|max:255',
-            'cf-turnstile-response'    => 'required|turnstile',
+            'cf-turnstile-response'    => ['required', new Turnstile()],
         ]);
     }
 
@@ -100,7 +101,6 @@ public function resend(LaravelRequest $request)
             if (!$validator->passes()) {
                 return Redirect::action('Auth\EmailVerificationController@showVerificationForm')->withErrors($validator);
             }
-
             $user = $this->user_service->resendVerificationEmail($payload);
 
             return view("auth.email_verification_resend_success", ['user' => $user]);

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -13,6 +13,7 @@
  **/
 
 use App\Http\Controllers\Controller;
+use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 use App\libs\Utils\EmailUtils;
 use App\Services\Auth\IUserService;
 use Illuminate\Support\Facades\Log;
@@ -162,7 +163,7 @@ protected function validator(array $data)
     {
         return Validator::make($data, [
             'email' => 'required|string|email|max:255',
-            'cf-turnstile-response' => 'required|turnstile',
+            'cf-turnstile-response' => ['required', new Turnstile()],
         ]);
     }
 

app/Http/Controllers/Auth/PasswordSetController.php

@@ -13,6 +13,7 @@
  **/
 
 use App\Http\Controllers\Controller;
+use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 use App\Http\Utils\CountryList;
 use App\libs\Auth\Repositories\IUserRegistrationRequestRepository;
 use App\Services\Auth\IUserService;
@@ -155,7 +156,7 @@ protected function validator(array $data)
             'company' => 'sometimes|string|max:100',
             'country_iso_code' => 'required|string|country_iso_alpha2_code',
             'password' => 'required|string|confirmed|password_policy',
-            'cf-turnstile-response' => 'required|turnstile',
+            'cf-turnstile-response' => ['required', new Turnstile()],
         ]);
     }
 

app/Http/Controllers/Auth/RegisterController.php

@@ -13,6 +13,7 @@
  **/
 use App\Http\Controllers\Controller;
 use App\Http\Utils\CountryList;
+use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 use App\Services\Auth\IUserService;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
@@ -177,7 +178,7 @@ protected function validator(array $data)
             'country_iso_code'         => 'required|string|country_iso_alpha2_code',
             'email'                    => 'required|string|email|max:255',
             'password'                 => 'required|string|confirmed|password_policy',
-            'cf-turnstile-response'    => 'required|turnstile',
+            'cf-turnstile-response'    => ['required', new Turnstile()],
         ];
 
         if(!empty(Config::get("app.code_of_conduct_link", null))){

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -13,6 +13,7 @@
  **/
 use App\Http\Controllers\Controller;
 use App\libs\Auth\Repositories\IUserPasswordResetRequestRepository;
+use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 use App\Services\Auth\IUserService;
 use Auth\Exceptions\UserPasswordResetRequestVoidException;
 use Illuminate\Support\Facades\Log;
@@ -113,7 +114,7 @@ protected function validator(array $data)
         return Validator::make($data, [
             'token'                    => 'required',
             'password'                 => 'required|string|confirmed|password_policy',
-            'cf-turnstile-response'    => 'required|turnstile',
+            'cf-turnstile-response'    => ['required', new Turnstile()],
         ]);
     }
 

app/Http/Controllers/UserController.php

@@ -13,6 +13,7 @@
  **/
 
 use App\Http\Controllers\OpenId\DiscoveryController;
+use RyanChandler\LaravelCloudflareTurnstile\Rules\Turnstile;
 use App\Jobs\RevokeUserGrantsOnExplicitLogout;
 use App\Http\Controllers\OpenId\OpenIdController;
 use App\Http\Controllers\Traits\JsonResponses;
@@ -420,7 +421,7 @@ public function postLogin()
             ];
 
             if ($login_attempts >= $max_login_attempts_2_show_captcha) {
-                $rules['cf-turnstile-response'] = 'required|turnstile';
+                $rules['cf-turnstile-response'] = ['required', new Turnstile()];
             }
             // Create a new validator instance.
             $validator = Validator::make($data, $rules);