Fixed #6703 - fixes password confirmation (#6711)

* Fixed #6703 - fixes password confirmation

* Removed debugging

* Fixed tests

* I guess we use 10 as the settings for password min in tests

* One more try to fix tests - confirmation won’t validate until password validates

app/Http/Controllers/ProfileController.php

@@ -125,8 +125,7 @@ class ProfileController extends Controller
 
         $rules = array(
             'current_password'     => 'required',
-            'password'         => Setting::passwordComplexityRulesSaving('store'),
-            'password_confirm' => 'required|same:password',
+            'password'         => Setting::passwordComplexityRulesSaving('store').'|confirmed',
         );
 
         $validator = \Validator::make($request->all(), $rules);

app/Http/Requests/SaveUserRequest.php

@@ -37,7 +37,7 @@ class SaveUserRequest extends Request
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
                 if ($this->request->get('ldap_import') == false)
                 {
-                    $rules['password'] = Setting::passwordComplexityRulesSaving('store');
+                    $rules['password'] = Setting::passwordComplexityRulesSaving('store').'|confirmed';
                 }
                 break;
             }
@@ -46,7 +46,7 @@ class SaveUserRequest extends Request
             case 'PUT':
                 $rules['first_name'] = 'required|string|min:1';
                 $rules['username'] = 'required_unless:ldap_import,1|string|min:1';
-                $rules['password'] = Setting::passwordComplexityRulesSaving('update');
+                $rules['password'] = Setting::passwordComplexityRulesSaving('update').'|confirmed';
                 break;
 
             // Save only what's passed
@@ -58,9 +58,7 @@ class SaveUserRequest extends Request
 
             default:break;
         }
-
-        $rules['password_confirm'] = 'sometimes|required_with:password';
-
+        
         return $rules;
 
     }

app/Http/Requests/SetupUserRequest.php

@@ -29,8 +29,7 @@ class SetupUserRequest extends Request
           'last_name' => 'required|string|min:1',
           'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at',
           'email' => 'email|unique:users,email',
-          'password' => 'required|min:6',
-          'password_confirm' => 'required|min:6|same:password',
+          'password' => 'required|min:6|confirmed',
           'email_domain' => 'required|min:4',
         ];
     }