User edit: add username to the form.

app/Http/Controllers/UserController.php

@@ -28,10 +28,11 @@ class UserController extends Controller
         $data = $request->validated();
 
         $user = $request->user();
+        $user->username = $data['username'];
         $user->password = Hash::make($data['password']);
         $user->save();
 
         return redirect()->route('user.index')
-            ->with('success', 'Password was updated');
+            ->with('success', 'Your account was updated!');
     }
 }

app/Http/Requests/UserRequest.php

@@ -3,6 +3,7 @@
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class UserRequest extends FormRequest
 {
@@ -16,6 +17,18 @@ class UserRequest extends FormRequest
         return auth()->user() !== null;
     }
 
+    /**
+     * Get the error messages for the defined validation rules.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'current_password.required_with' => __('validation.password'),
+        ];
+    }
+
     /**
      * Get the validation rules that apply to the request.
      *
@@ -24,8 +37,9 @@ class UserRequest extends FormRequest
     public function rules()
     {
         return [
-            'current_password' => 'required|current_password',
-            'password' => 'required|min:8|confirmed',
+            'username' => [ 'required', 'min:4', Rule::unique('users')->ignore(auth()->user()) ],
+            'current_password' => 'nullable|required_with:password|current_password',
+            'password' => 'nullable|min:8|confirmed',
         ];
     }
 }