split user save and password save

Author: dietercoopman

README.md

@@ -110,17 +110,6 @@ class MyUser extends \LLoadoutInforce\Http\Livewire\User
         ];
     }
 
-    public function saveUser()
-    {
-        $this->validate();
-
-        $this->handlePassword();
-        $this->user->save();
-        $this->user->syncRoles([$this->userRoles]);
-
-    }
-
-
 }
 
 ```

resources/views/user-ui/user.blade.php

@@ -60,7 +60,7 @@
     </x-jet-form-section>
     <x-jet-section-border/>
 
-    <x-jet-form-section submit="updateUser">
+    <x-jet-form-section submit="updatePassword">
         <x-slot name="title">
             {{ __('Password') }}
         </x-slot>
@@ -72,13 +72,13 @@
         <x-slot name="form">
             <div class="col-span-6 sm:col-span-4">
                 <x-jet-label for="password" value="{{ __('Password') }}"/>
-                <x-jet-input id="password" type="password" class="mt-1 block w-full" wire:model.defer="user.password" autocomplete="name"/>
-                <x-jet-input-error for="user.password" class="mt-2"/>
+                <x-jet-input id="password" type="password" class="mt-1 block w-full" wire:model.defer="credentials.password" autocomplete="name"/>
+                <x-jet-input-error for="credentials.password" class="mt-2"/>
             </div>
             <div class="col-span-6 sm:col-span-4">
                 <x-jet-label for="password_confirmation" value="{{ __('Confirm password') }}"/>
-                <x-jet-input id="password_confirmation" type="password" class="mt-1 block w-full" wire:model.defer="user.password_confirmation" autocomplete="name"/>
-                <x-jet-input-error for="user.password_confirmation" class="mt-2"/>
+                <x-jet-input id="password_confirmation" type="password" class="mt-1 block w-full" wire:model.defer="credentials.password_confirmation" autocomplete="name"/>
+                <x-jet-input-error for="credentials.password_confirmation" class="mt-2"/>
             </div>
         </x-slot>
         <x-slot name="actions">

src/Http/Livewire/User.php

@@ -2,7 +2,7 @@
 
 namespace LLoadoutInforce\Http\Livewire;
 
-use Hash;
+use Illuminate\Support\Facades\Auth;
 use Livewire\Component;
 use LLoadoutInforce\Http\Livewire\Traits\HandlesPermissions;
 use LLoadoutInforce\Http\Livewire\Traits\ShowPerks;
@@ -13,15 +13,14 @@ class User extends Component
     use HandlesPermissions, ShowPerks;
 
     public $user;
+    public $credentials;
     public $userRoles = [];
 
     protected function rules()
     {
         return [
             'user.name'                  => 'required|string',
             'user.email'                 => ['required', 'email', 'not_in:' . $this->user->id],
-            'user.password'              => 'required|confirmed',
-            'user.password_confirmation' => 'required'
         ];
     }
 
@@ -47,17 +46,24 @@ public function updateUser()
     {
         $this->validate();
 
-        $this->handlePassword();
         $this->user->save();
         $this->user->syncRoles([$this->userRoles]);
 
     }
 
-    private function handlePassword()
+    public function updatePassword()
     {
-        $this->user->password = Hash::make($this->user->password);
-        //TODO : maybe this can be done better , remove because otherwise stored to db
-        unset($this->user->password_confirmation);
+        $validatedData = $this->validate([
+            'credentials.password'              => 'required|confirmed',
+            'credentials.password_confirmation' => 'required'
+        ]);
+        $this->user->forceFill([
+            'password' => \Illuminate\Support\Facades\Hash::make($this->credentials['password']),
+        ])->save();
+        Auth::login($this->user);
+
     }
 
+
+
 }