fix rule unique issue and logout user on email change

tastyigniter · Jan 7, 2024 · 26c0c9e · 26c0c9e
1 parent 8a4bfdf
commit 26c0c9e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Http/Controllers/Users.php b/src/Http/Controllers/Users.php
@@ -90,6 +90,11 @@ public function account_onSave()
         $usernameChanged = $this->currentUser->username != post('User[username]');
         $passwordChanged = strlen(post('User[password]'));
         $languageChanged = $this->currentUser->language != post('User[language_id]');
+        $emailChanged = $this->currentUser->email != post('User[email]');
+        if ($emailChanged) {
+            AdminAuth::logout();
+            return redirect('/admin/login');
+        }
         if ($usernameChanged || $passwordChanged || $languageChanged) {
             $this->currentUser->reload()->reloadRelations();
             AdminAuth::login($this->currentUser, true);

diff --git a/src/Requests/UserRequest.php b/src/Requests/UserRequest.php
@@ -3,6 +3,7 @@
 namespace Igniter\User\Requests;
 
 use Igniter\System\Classes\FormRequest;
+use Igniter\User\Facades\AdminAuth;
 use Illuminate\Validation\Rule;
 
 class UserRequest extends FormRequest
@@ -30,10 +31,10 @@ public function rules()
         return [
             'name' => ['required', 'string', 'between:2,255'],
             'email' => ['required', 'max:96', 'email:filter',
-                Rule::unique('admin_users')->ignore($this->getRecordId(), 'user_id'),
+                Rule::unique('admin_users')->ignore(AdminAuth::id(), 'user_id'),
             ],
             'username' => ['required', 'alpha_dash', 'between:2,32',
-                Rule::unique('admin_users')->ignore($this->getRecordId(), 'user_id'),
+                Rule::unique('admin_users')->ignore(AdminAuth::id(), 'user_id'),
             ],
             'password' => ['sometimes', 'required_if:send_invite,0', 'string', 'between:6,32', 'same:password_confirm'],
             'status' => ['boolean'],