change telephone id for every user

This commit is contained in:
2025-05-06 14:15:49 +03:30
parent ab042b3a44
commit 1a1a0aa57b
15 changed files with 64 additions and 40 deletions

View File

@@ -5,8 +5,8 @@ namespace App\Http\Controllers\Admin;
use App\Facades\DataTable\DataTableFacade;
use App\Facades\File\FileFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\StoreRequest;
use App\Http\Requests\Admin\UpdateRequest;
use App\Http\Requests\Admin\UserManagement\StoreRequest;
use App\Http\Requests\Admin\UserManagement\UpdateRequest;
use App\Http\Resources\Admin\UserResource;
use App\Http\Traits\ApiResponse;
use App\Models\Province;
@@ -22,7 +22,6 @@ class UserManagementController extends Controller
public function index(Request $request): JsonResponse
{
$columns = array('id', 'full_name', 'username', 'province_id', 'phone_number', 'national_id', 'telephone_id');
$allowedFilters = $columns;
@@ -68,7 +67,7 @@ class UserManagementController extends Controller
'telephone_id' => $request->telephone_id,
]);
$user->syncPermissions($request->permissions);
$user->assignRole($request->role);
});
return $this->successResponse();
@@ -102,7 +101,7 @@ class UserManagementController extends Controller
'telephone_id' => $request->telephone_id
]);
$user->syncPermissions($request->permissions);
$user->syncRoles($request->role);
});
return $this->successResponse();

View File

@@ -18,11 +18,11 @@ class AuthController extends Controller
if ($this->attemptLogin($request))
{
$request->session()->regenerate();
$this->updateLastLogin($request);
$this->updateUserInfo($request);
return $this->successResponse();
}
return $this->errorResponse();
return $this->errorResponse(__('messages.invalid_credentials'));
}
protected function attemptLogin(Request $request): bool
@@ -30,19 +30,19 @@ class AuthController extends Controller
return Auth::guard()->attempt($request->only('username', 'password'));
}
protected function updateLastLogin(Request $request): void
protected function updateUserInfo(Request $request): void
{
if (!$request->session()->exists('last_login')) {
$request->session()->put('last_login', now());
}
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();

View File

@@ -119,7 +119,6 @@ class CallController extends Controller
public function list(ListRequest $request): JsonResponse
{
User::query()->find(1)->givePermissionTo([1, 2, 3]);
$phone_number = $request->phone_number;
$size = $request->size ?? config('global_variables.MAX_RECORDS_COUNT');

View File

@@ -6,6 +6,7 @@ use App\Http\Requests\ChangePasswordRequest;
use App\Http\Resources\Admin\UserResource;
use App\Http\Traits\ApiResponse;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Hash;
class ProfileController extends Controller
@@ -15,7 +16,6 @@ class ProfileController extends Controller
public function info(): JsonResponse
{
return $this->successResponse(new UserResource(auth()->user()));
}
public function changePassword(ChangePasswordRequest $request): JsonResponse
{
@@ -29,4 +29,20 @@ class ProfileController extends Controller
return $this->successResponse();
}
public function online(): JsonResponse
{
auth()->user()->update([
'is_online' => true,
]);
return $this->successResponse();
}
public function offline(): JsonResponse
{
auth()->user()->update([
'is_online' => false,
]);
return $this->successResponse();
}
}