diff --git a/app/Http/Controllers/Admin/UserManagementController.php b/app/Http/Controllers/Admin/UserManagementController.php index 1f7f035..55d639c 100644 --- a/app/Http/Controllers/Admin/UserManagementController.php +++ b/app/Http/Controllers/Admin/UserManagementController.php @@ -79,6 +79,7 @@ class UserManagementController extends Controller 'province_id' => $province->id, 'province_fa' => $province->name, 'email' => $request->email, + 'telephone_id' => $request->telephone_id, ]); $user->syncRoles(Role::query()->find($request->role_id)); diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index f9a7ab6..c566d73 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -33,15 +33,11 @@ class AuthController extends Controller { Auth::user()->update([ 'last_login' => now(), - 'telephone_id' => $request->telephone_id, ]); } public function logout(Request $request): JsonResponse { - Auth::user()->update([ - 'telephone_id' => null, - ]); Auth::guard()->logout(); $request->session()->invalidate(); $request->session()->regenerateToken(); diff --git a/app/Http/Requests/Admin/UserManagement/StoreRequest.php b/app/Http/Requests/Admin/UserManagement/StoreRequest.php index a8bd73d..cc34bdb 100644 --- a/app/Http/Requests/Admin/UserManagement/StoreRequest.php +++ b/app/Http/Requests/Admin/UserManagement/StoreRequest.php @@ -32,8 +32,8 @@ class StoreRequest extends FormRequest 'province_id' => 'required|exists:provinces,id', 'password' => 'required|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8', 'role_id' => 'required|exists:roles,id', - 'avatar' => 'mimes:png,jpg,pdf|max:2048', 'email' => 'email|unique:users,email', + 'telephone_id' => 'required|numeric|unique:users,telephone_id', ]; } } diff --git a/app/Http/Requests/Admin/UserManagement/UpdateRequest.php b/app/Http/Requests/Admin/UserManagement/UpdateRequest.php index 436995c..28590a0 100644 --- a/app/Http/Requests/Admin/UserManagement/UpdateRequest.php +++ b/app/Http/Requests/Admin/UserManagement/UpdateRequest.php @@ -39,6 +39,7 @@ class UpdateRequest extends FormRequest 'role_id' => 'required|exists:roles,id', 'avatar' => 'mimes:png,jpg,pdf|max:2048', 'email' => ['email', Rule::unique('users', 'email')->ignore($this->user->id)], + 'telephone_id' => ['required', 'numeric', Rule::unique('users', 'telephone_id')->ignore($this->user->id)], ]; } } diff --git a/app/Http/Requests/Auth/LoginRequest.php b/app/Http/Requests/Auth/LoginRequest.php index 3c57153..b1b0a94 100644 --- a/app/Http/Requests/Auth/LoginRequest.php +++ b/app/Http/Requests/Auth/LoginRequest.php @@ -27,25 +27,6 @@ class LoginRequest extends FormRequest return [ 'username' => 'required|exists:users,username', 'password' => 'required|string', - 'telephone_id' => 'required|string' - ]; - } - - public function after(): array - { - return [ - function (Validator $validator) { - $user = User::query()->where('telephone_id', '=', $this->telephone_id); - if ($user->exists()) { - if ($user->first()->is_online) { - $validator->errors()->add( - 'telephone_id', - __('messages.telephone_id_is_in_use') - ); - } - $user->first()->update(['telephone_id' => null]); - } - } ]; } }