Merge branch 'development'

Author: rappasoft

CHANGELOG.md

@@ -3,13 +3,24 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-## [7.0.0] - 2020-06-26
+## [7.0.1] - 2020-06-28
 
-Started from scratch with a blank Laravel 7.* installation. This release is not an upgrade, and for that reason it is impossible to document all the changes that occurred. This version should be used for new projects.
+## Added
 
-### Added
+- Missing captcha functionality for login/register
 
-### Removed
+## Changed
+
+- Seed second role in production not just testing
+
+## Removed
+
+- Duplicate user tests
+- Terser in mix file
+
+## [7.0.0] - 2020-06-26
+
+Started from scratch with a blank Laravel 7.* installation. This release is not an upgrade, and for that reason it is impossible to document all the changes that occurred. This version should be used for new projects.
 
 ## [6.0.3] - 2020-02-17
 
@@ -184,7 +195,8 @@ Started from scratch with a blank Laravel 7.* installation. This release is not
 - Fix yarn tests
 - Fix: Socially logged in users get assigned the default role
 
-[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.0...development
+[Unreleased]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.1...development
+[7.0.1]: https://github.com/rappasoft/laravel-boilerplate/compare/v7.0.0...v7.0.1
 [7.0.0]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.3...v7.0.0
 [6.0.3]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.2...v6.0.3
 [6.0.2]: https://github.com/rappasoft/laravel-boilerplate/compare/v6.0.1...v6.0.2

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']),
         ]);
     }
 

composer.lock

@@ -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',