Add missing captcha to login/register

Add password rules to login request

Author: rappasoft

app/Domains/Auth/Http/Controllers/Frontend/Auth/LoginController.php

@@ -8,6 +8,7 @@
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\Http\Request;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class LoginController.
@@ -54,6 +55,25 @@ public function showLoginForm()
         return view('frontend.auth.login');
     }
 
+    /**
+     * Validate the user login request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return void
+     *
+     * @throws \Illuminate\Validation\ValidationException
+     */
+    protected function validateLogin(Request $request)
+    {
+        $request->validate([
+            $this->username() => 'required|string',
+            'password' => PasswordRules::login(),
+            'g-recaptcha-response' => ['required_if:captcha_status,true', 'captcha'],
+        ], [
+            'g-recaptcha-response.required_if' => __('validation.required', ['attribute' => 'captcha']),
+        ]);
+    }
+
     /**
      * Overidden for 2FA
      * https://github.com/DarkGhostHunter/Laraguard#protecting-the-login.

app/Domains/Auth/Http/Controllers/Frontend/Auth/RegisterController.php

@@ -76,6 +76,9 @@ protected function validator(array $data)
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users')],
             'password' => PasswordRules::register($data['email'] ?? null),
+            'g-recaptcha-response' => ['required_if:captcha_status,true', 'captcha'],
+        ], [
+            'g-recaptcha-response.required_if' => __('validation.required', ['attribute' => 'captcha']),
         ]);
     }
 

config/boilerplate.php

@@ -14,6 +14,11 @@
     | Configurations related to the boilerplate's access/authorization options
     */
     'access' => [
+        'captcha' => [
+            'registration' => env('REGISTRATION_CAPTCHA_STATUS', false),
+            'login' => env('LOGIN_CAPTCHA_STATUS', false),
+        ],
+
         'middleware' => [
             'confirm' => 'password.confirm:frontend.auth.password.confirm',
             'verified' => 'verified:frontend.auth.verification.notice',

phpunit.xml

@@ -35,9 +35,9 @@
         <server name="DB_DATABASE" value=":memory:"/>
         <server name="ENABLE_REGISTRATION" value="true"/>
         <server name="LOGIN_CAPTCHA_STATUS" value="false"/>
+        <server name="REGISTRATION_CAPTCHA_STATUS" value="false"/>
         <server name="MAIL_MAILER" value="array"/>
         <server name="QUEUE_CONNECTION" value="sync"/>
-        <server name="REGISTRATION_CAPTCHA_STATUS" value="false"/>
         <server name="SESSION_DRIVER" value="array"/>
         <server name="TELESCOPE_ENABLED" value="false"/>
     </php>

resources/views/frontend/auth/login.blade.php

@@ -40,6 +40,15 @@
                             </div>
                         </div><!--form-group-->
 
+                        @if(config('boilerplate.access.captcha.login'))
+                            <div class="row">
+                                <div class="col">
+                                    @captcha
+                                    <input type="hidden" name="captcha_status" value="true" />
+                                </div><!--col-->
+                            </div><!--row-->
+                        @endif
+
                         <div class="form-group row mb-0">
                             <div class="col-md-8 offset-md-4">
                                 <button class="btn btn-primary" type="submit">@lang('Login')</button>

resources/views/frontend/auth/register.blade.php

@@ -44,6 +44,15 @@
                             </div>
                         </div><!--form-group-->
 
+                        @if(config('boilerplate.access.captcha.registration'))
+                            <div class="row">
+                                <div class="col">
+                                    @captcha
+                                    <input type="hidden" name="captcha_status" value="true" />
+                                </div><!--col-->
+                            </div><!--row-->
+                        @endif
+
                         <div class="form-group row mb-0">
                             <div class="col-md-6 offset-md-4">
                                 <button class="btn btn-primary" type="submit">@lang('Register')</button>