- Remove change password rule

rappasoft · rappasoft · commit 5dd5e3d96cd2 · 2019-08-21T14:24:18.000-04:00
diff --git a/app/Http/Requests/Backend/Auth/User/UpdateUserPasswordRequest.php b/app/Http/Requests/Backend/Auth/User/UpdateUserPasswordRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests\Backend\Auth\User;
 
-use App\Rules\Auth\ChangePassword;
 use App\Rules\Auth\UnusedPassword;
 use Illuminate\Foundation\Http\FormRequest;
 use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
@@ -32,7 +31,6 @@ public function rules()
         return [
             'password' => array_merge(
                 [
-                    new ChangePassword(),
                     new UnusedPassword((int) $this->segment(4)),
                 ],
                 PasswordRules::changePassword($this->email)
diff --git a/app/Http/Requests/Frontend/Auth/ResetPasswordRequest.php b/app/Http/Requests/Frontend/Auth/ResetPasswordRequest.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Requests\Frontend\Auth;
 
-use App\Rules\Auth\ChangePassword;
 use App\Rules\Auth\UnusedPassword;
 use Illuminate\Foundation\Http\FormRequest;
 use LangleyFoxall\LaravelNISTPasswordRules\PasswordRules;
@@ -34,7 +33,6 @@ public function rules()
             'email' => ['required', 'email'],
             'password' => array_merge(
                 [
-                    new ChangePassword(),
                     new UnusedPassword($this->get('token')),
                 ],
                 PasswordRules::changePassword($this->email)
diff --git a/app/Http/Requests/Frontend/User/UpdatePasswordRequest.php b/app/Http/Requests/Frontend/User/UpdatePasswordRequest.php
@@ -33,7 +33,6 @@ public function rules()
             'old_password' => ['required'],
             'password' => array_merge(
                 [
-                    new ChangePassword(),
                     new UnusedPassword($this->user()),
                 ],
                 PasswordRules::changePassword(
diff --git a/app/Rules/Auth/ChangePassword.php b/app/Rules/Auth/ChangePassword.php
diff --git a/resources/lang/ar/auth.php b/resources/lang/ar/auth.php
@@ -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 ليس نوع تسجيل دخول صحيح.',
diff --git a/resources/lang/da/auth.php b/resources/lang/da/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Disse legitimationsoplysninger passer ikke vores optegnelser.',
     'general_error' => 'Du har ikke adgang til at udføre denne handling.',
-    '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 kan ikke anvendes som login.',
diff --git a/resources/lang/de/auth.php b/resources/lang/de/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Zugangsdaten nicht gefunden.',
     'general_error' => 'Du hast keine Berechtigung um dies zu machen.',
-    'password_rules' => 'Your password must be more than 8 characters long, should contain at least 1 uppercase, 1 lowercase and 1 number.',
     'password_used' => 'Du kannst kein Passwort benutzen, das du schon einmal verwendet hast.',
     'socialite' => [
         'unacceptable' => ':provider ist kein akzeptierter Anmeldetyp.',
diff --git a/resources/lang/el/auth.php b/resources/lang/el/auth.php
@@ -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 δεν είναι αποδεκτός τρόπος σύνδεσης.',
diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'These credentials do not match our records.',
     'general_error' => 'You do not have access to do that.',
-    '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 is not an acceptable login type.',
diff --git a/resources/lang/es/auth.php b/resources/lang/es/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Las credenciales no se han encontrado.',
     'general_error' => 'No tiene suficientes permisos.',
-    'password_rules' => 'Su contraseña debe tener más de 8 caracteres, al menos una letra mayúscula, una minúscula y un número.',
     'password_used' => 'No puede establecer una contraseña que haya usado previamente.',
     'socialite' => [
         'unacceptable' => ':provider no es un tipo de autenticación válido.',
diff --git a/resources/lang/fr/auth.php b/resources/lang/fr/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Ces informations de connexion ne correspondent pas.',
     'general_error' => "Vous n'avez pas les droits requis pour cette action.",
-    'password_rules' => 'Your password must be more than 8 characters long, should contain at least 1 uppercase, 1 lowercase and 1 number.',
     'password_used' => 'Vous ne pouvez pas utiliser un mot de passe que vous avez déjà utilisé',
     'socialite' => [
         'unacceptable' => 'Le login :provider est de type incorrect.',
diff --git a/resources/lang/he/auth.php b/resources/lang/he/auth.php
@@ -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.',
diff --git a/resources/lang/id/auth.php b/resources/lang/id/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Identitas tersebut tidak cocok dengan catatan kami.',
     'general_error' => 'Anda tidak memiliki akses untuk melakukan itu.',
-    '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 bukanlah jenis login diterima.',
diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Le credenziali non corrispondono a quelle registrate.',
     'general_error' => 'Non hai diritti sufficienti per questa operazione.',
-    '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 non è supportato.',
diff --git a/resources/lang/ja/auth.php b/resources/lang/ja/auth.php
@@ -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 受け入れ可能なログインタイプではありません。',
diff --git a/resources/lang/nl/auth.php b/resources/lang/nl/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Toegangsgegevens niet gevonden',
     'general_error' => 'Je hebt niet de rechten om dat te doen.',
-    'password_rules' => 'Je wachtwoord moet minstens 8 tekens lang zijn, moet minstens 1 hoofdletter, 1 kleine letter en 1 nummer bevatten.',
     'password_used' => 'Je kan geen wachtwoord instellen dat je al eerder gebruikte.',
     'socialite' => [
         'unacceptable' => ':provider is niet een geaccepteerd login type.',
diff --git a/resources/lang/no/auth.php b/resources/lang/no/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Brukernavn eller passord stemmer ikke.',
     'general_error' => 'Du har ikke tilgang til at utføre denne handling.',
-    '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 kan ikke brukes som login.',
diff --git a/resources/lang/pt_BR/auth.php b/resources/lang/pt_BR/auth.php
@@ -15,7 +15,6 @@
 
     'failed' => 'Estas credenciais não correspondem com nossos registros.',
     'general_error' => 'Você não tem acesso para fazer isso.',
-    'password_rules' => 'Sua senha deve conter 8 caracteres ou mais, pelo menos uma letra maiúscula, uma letra minúscula e um número.',
     'password_used' => 'Você não pode definir uma senha que você já tenha usado anteriormente.',
     'socialite' => [
         'unacceptable' => ':provider não é um tipo de login aceitável.',
diff --git a/resources/lang/ru/auth.php b/resources/lang/ru/auth.php
@@ -15,7 +15,6 @@
 
     'failed' => 'Имя пользователя и пароль не совпадают.',
     'general_error' => 'У вас нет прав для просмотра этой страницы.',
-    'password_rules' => 'Ваш пароль должен быть длиной более 8 символов, должен содержать минимум 1 заглавную букву, 1 маленькую букву и 1 номер.',
     'password_used' => 'Вы не можете установить пароль, который вы ранее использовали.',
     'socialite' => [
         'unacceptable' => ':provider не приемлемый тип для входа.',
diff --git a/resources/lang/sv/auth.php b/resources/lang/sv/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Dessa uppgifter stämmer inte överens med vårt register.',
     'general_error' => 'Du har inte tillstånd att göra det där.',
-    '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 kan inte att användas vid inloggning.',
diff --git a/resources/lang/th/auth.php b/resources/lang/th/auth.php
@@ -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',
diff --git a/resources/lang/tr/auth.php b/resources/lang/tr/auth.php
@@ -14,7 +14,6 @@
 
     'failed' => 'Bu kimlik bilgileri kayıtlarımızla eşleşmiyor.',
     'general_error' => 'Bunu yapmak için erişiminiz yok.',
-    '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 kabul edilen bir oturum açma türü değil.',
diff --git a/resources/lang/uk/auth.php b/resources/lang/uk/auth.php
@@ -15,7 +15,6 @@
 
     'failed' => 'Ці облікові дані не збігаються з нашими записами.',
     'general_error' => 'У вас немає прав для перегляду цієї сторінки.',
-    'password_rules' => 'Ваш пароль має бути довжиною більше 8 символів, повинен містити принаймні 1 велику літеру, 1 маленьку літеру та 1 номер.',
     'password_used' => 'Ви не можете встановити пароль, який ви раніше використовували.',
     'socialite' => [
         'unacceptable' => ':provider неприйнятний тип для входу.',
diff --git a/resources/lang/zh-TW/auth.php b/resources/lang/zh-TW/auth.php
@@ -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 的登錄方式失敗。 ',
diff --git a/resources/lang/zh/auth.php b/resources/lang/zh/auth.php
@@ -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 不是可接受的登录类型。',
diff --git a/tests/Feature/Backend/User/ChangeUserPasswordTest.php b/tests/Feature/Backend/User/ChangeUserPasswordTest.php
@@ -21,11 +21,11 @@ public function the_password_can_be_validated()
 
         $response = $this->followingRedirects()
             ->patch("/admin/auth/user/{$user->id}/password/change", [
-                'password' => '12345678',
-                'password_confirmation' => '12345678',
+                'password' => '1234567',
+                'password_confirmation' => '1234567',
             ]);
 
-        $this->assertStringContainsString(__('auth.password_rules'), $response->content());
+        $this->assertStringContainsString('The password must be at least 8 characters.', $response->content());
     }
 
     /** @test */
diff --git a/tests/Feature/Frontend/ChangePasswordTest.php b/tests/Feature/Frontend/ChangePasswordTest.php
@@ -20,11 +20,11 @@ public function the_password_can_be_validated()
             ->followingRedirects()
             ->patch('/password/update', [
                 'old_password' => '1234',
-                'password' => '12345678',
-                'password_confirmation' => '12345678',
+                'password' => '1234567',
+                'password_confirmation' => '1234567',
             ]);
 
-        $this->assertStringContainsString(__('auth.password_rules'), $response->content());
+        $this->assertStringContainsString('The password must be at least 8 characters.', $response->content());
     }
 
     /** @test */
diff --git a/tests/Feature/Frontend/PasswordExpirationTest.php b/tests/Feature/Frontend/PasswordExpirationTest.php
@@ -71,7 +71,7 @@ public function the_password_can_be_validated()
                 'password_confirmation' => 'secret',
             ]);
 
-        $this->assertStringContainsString(__('auth.password_rules'), $response->content());
+        $this->assertStringContainsString('The password must be at least 8 characters.', $response->content());
     }
 
     /** @test */
diff --git a/tests/Feature/Frontend/ResetPasswordTest.php b/tests/Feature/Frontend/ResetPasswordTest.php
@@ -80,7 +80,7 @@ public function the_password_can_be_validated()
                 'password_confirmation' => 'secret',
             ]);
 
-        $this->assertStringContainsString(__('auth.password_rules'), $response->content());
+        $this->assertStringContainsString('The password must be at least 8 characters.', $response->content());
     }
 
     /** @test */
diff --git a/tests/Feature/Rule/ChangePasswordRuleTest.php b/tests/Feature/Rule/ChangePasswordRuleTest.php

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function rules()`
`33`	`33`	`'old_password' => ['required'],`
`34`	`34`	`'password' => array_merge(`
`35`	`35`	`[`
`36`		`- new ChangePassword(),`
`37`	`36`	`new UnusedPassword($this->user()),`
`38`	`37`	`],`
`39`	`38`	`PasswordRules::changePassword(`