Merge branch 'DivineOmega-feature/nist-rules' into development

Author: rappasoft

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

@@ -10,6 +10,7 @@
 use App\Events\Frontend\Auth\UserLoggedIn;
 use App\Events\Frontend\Auth\UserLoggedOut;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class LoginController.
@@ -47,6 +48,22 @@ public function username()
         return config('access.users.username');
     }
 
+    /**
+     * 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(),
+        ]);
+    }
+
     /**
      * The user has been authenticated.
      *

app/Http/Requests/Backend/Auth/User/StoreUserRequest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class StoreUserRequest.
@@ -31,7 +32,7 @@ public function rules()
             'first_name' => ['required', 'max:191'],
             'last_name' => ['required', 'max:191'],
             'email' => ['required', 'email', 'max:191', Rule::unique('users')],
-            'password' => ['required', 'min:6', 'confirmed'],
+            'password' => PasswordRules::register($this->email),
             'roles' => ['required', 'array'],
         ];
     }

app/Http/Requests/Backend/Auth/User/UpdateUserPasswordRequest.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Requests\Backend\Auth\User;
 
-use App\Rules\Auth\ChangePassword;
 use App\Rules\Auth\UnusedPassword;
 use Illuminate\Foundation\Http\FormRequest;
-use DivineOmega\LaravelPasswordExposedValidationRule\PasswordExposed;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class UpdateUserPasswordRequest.
@@ -30,13 +29,12 @@ public function authorize()
     public function rules()
     {
         return [
-            'password' => [
-                'required',
-                'confirmed',
-                new ChangePassword(),
-                new PasswordExposed(),
-                new UnusedPassword((int) $this->segment(4)),
-            ],
+            'password' => array_merge(
+                [
+                    new UnusedPassword((int) $this->segment(4)),
+                ],
+                PasswordRules::changePassword($this->email)
+            ),
         ];
     }
 }

app/Http/Requests/Frontend/Auth/RegisterRequest.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class RegisterRequest.
@@ -31,7 +32,7 @@ public function rules()
             'first_name' => ['required', 'string', 'max:191'],
             'last_name' => ['required', 'string', 'max:191'],
             'email' => ['required', 'string', 'email', 'max:191', Rule::unique('users')],
-            'password' => ['required', 'string', 'min:6', 'confirmed'],
+            'password' => PasswordRules::register($this->email),
             'g-recaptcha-response' => ['required_if:captcha_status,true', 'captcha'],
         ];
     }

app/Http/Requests/Frontend/Auth/ResetPasswordRequest.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Requests\Frontend\Auth;
 
-use App\Rules\Auth\ChangePassword;
 use App\Rules\Auth\UnusedPassword;
 use Illuminate\Foundation\Http\FormRequest;
-use DivineOmega\LaravelPasswordExposedValidationRule\PasswordExposed;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class ResetPasswordRequest.
@@ -32,13 +31,12 @@ public function rules()
         return [
             'token' => ['required'],
             'email' => ['required', 'email'],
-            'password' => [
-                'required',
-                'confirmed',
-                new ChangePassword(),
-                new PasswordExposed(),
-                new UnusedPassword($this->get('token')),
-            ],
+            'password' => array_merge(
+                [
+                    new UnusedPassword($this->get('token')),
+                ],
+                PasswordRules::changePassword($this->email)
+            ),
         ];
     }
 }

app/Http/Requests/Frontend/User/UpdatePasswordRequest.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Requests\Frontend\User;
 
-use App\Rules\Auth\ChangePassword;
 use App\Rules\Auth\UnusedPassword;
 use Illuminate\Foundation\Http\FormRequest;
-use DivineOmega\LaravelPasswordExposedValidationRule\PasswordExposed;
+use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
 
 /**
  * Class UpdatePasswordRequest.
@@ -31,13 +30,15 @@ public function rules()
     {
         return [
             'old_password' => ['required'],
-            'password' => [
-                'required',
-                'confirmed',
-                new ChangePassword(),
-                new PasswordExposed(),
-                new UnusedPassword($this->user()),
-            ],
+            'password' => array_merge(
+                [
+                    new UnusedPassword($this->user()),
+                ],
+                PasswordRules::changePassword(
+                    $this->email,
+                    config('access.users.password_history') ? 'old_password' : null
+                )
+            ),
         ];
     }
 }

app/Rules/Auth/ChangePassword.php

@@ -15,9 +15,9 @@
         "beyondcode/laravel-self-diagnosis": "^1.0",
         "creativeorange/gravatar": "~1.0",
         "davejamesmiller/laravel-breadcrumbs": "^5.0",
-        "divineomega/laravel-password-exposed-validation-rule": "^2.0.1",
         "fideloper/proxy": "^4.0",
         "hieu-le/active": "^3.5",
+        "langleyfoxall/laravel-nist-password-rules": "^4.0",
         "laravel/framework": "5.8.*",
         "laravel/socialite": "^4.1",
         "laravel/tinker": "^1.0",

composer.json

@@ -14,7 +14,6 @@
 
     'failed' => 'البيانات المدخلة لا تتطابق مع قاعدة بيناتنا.',
     'general_error' => 'ليس لديك صلاحية الوصول إلى هذا.',
-    'password_rules' => 'Your password must be more than 8 characters long, should contain at least 1 uppercase, 1 lowercase and 1 number.',
     'password_used' => 'You can not set a password that you have previously used.',
     'socialite' => [
         'unacceptable' => ':provider ليس نوع تسجيل دخول صحيح.',