Форматирование
This commit is contained in:
@@ -23,21 +23,21 @@ class AuthController extends Controller
|
||||
'department' => 'required|string',
|
||||
'position' => 'required|string',
|
||||
'phone' => 'nullable|string',
|
||||
'role' => 'required|in:doctor,nurse,head_of_department,statistician,admin'
|
||||
'role' => 'required|in:doctor,nurse,head_of_department,statistician,admin',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'errors' => $validator->errors()
|
||||
'errors' => $validator->errors(),
|
||||
], 422);
|
||||
}
|
||||
|
||||
// Проверка прав на создание пользователя
|
||||
if (Auth::check() && !Auth::user()->isAdmin()) {
|
||||
if (Auth::check() && ! Auth::user()->isAdmin()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Недостаточно прав для создания пользователя'
|
||||
'message' => 'Недостаточно прав для создания пользователя',
|
||||
], 403);
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ class AuthController extends Controller
|
||||
'position' => $request->position,
|
||||
'phone' => $request->phone,
|
||||
'role' => $request->role,
|
||||
'is_active' => true
|
||||
'is_active' => true,
|
||||
]);
|
||||
|
||||
$token = $user->createToken('auth_token')->plainTextToken;
|
||||
@@ -59,7 +59,7 @@ class AuthController extends Controller
|
||||
'message' => 'Пользователь успешно зарегистрирован',
|
||||
'user' => $user->only(['id', 'name', 'login', 'department', 'position', 'role']),
|
||||
'token' => $token,
|
||||
'permissions' => $user->permissions()
|
||||
'permissions' => $user->permissions(),
|
||||
], 201);
|
||||
}
|
||||
|
||||
@@ -67,9 +67,9 @@ class AuthController extends Controller
|
||||
public function login(Request $request)
|
||||
{
|
||||
// Проверяем, что пользователь уже авторизован через сессию
|
||||
if (!Auth::check()) {
|
||||
if (! Auth::check()) {
|
||||
return response()->json([
|
||||
'error' => 'Not authenticated'
|
||||
'error' => 'Not authenticated',
|
||||
], 401);
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ class AuthController extends Controller
|
||||
'user' => $user->only(['id', 'name', 'login']),
|
||||
'token' => $token,
|
||||
'permissions' => $user->permissions(),
|
||||
'available_departments' => $user->availableDepartments()
|
||||
'available_departments' => $user->availableDepartments(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ class AuthController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Успешный выход'
|
||||
'message' => 'Успешный выход',
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -111,10 +111,10 @@ class AuthController extends Controller
|
||||
{
|
||||
$user = $request->user();
|
||||
|
||||
if (!$user) {
|
||||
if (! $user) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Пользователь не авторизован'
|
||||
'message' => 'Пользователь не авторизован',
|
||||
], 401);
|
||||
}
|
||||
|
||||
@@ -122,7 +122,7 @@ class AuthController extends Controller
|
||||
'success' => true,
|
||||
'user' => $user->only(['id', 'name', 'login', 'department', 'position', 'role', 'phone']),
|
||||
'permissions' => $user->permissions(),
|
||||
'available_departments' => $user->availableDepartments()
|
||||
'available_departments' => $user->availableDepartments(),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -133,26 +133,26 @@ class AuthController extends Controller
|
||||
|
||||
$validator = Validator::make($request->all(), [
|
||||
'name' => 'sometimes|string|max:255',
|
||||
'login' => 'sometimes|unique:users,login,' . $user->id,
|
||||
'login' => 'sometimes|unique:users,login,'.$user->id,
|
||||
'current_password' => 'required_with:password',
|
||||
'password' => 'sometimes|min:8|confirmed',
|
||||
'department' => 'sometimes|string',
|
||||
'phone' => 'sometimes|string'
|
||||
'phone' => 'sometimes|string',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'errors' => $validator->errors()
|
||||
'errors' => $validator->errors(),
|
||||
], 422);
|
||||
}
|
||||
|
||||
// Проверка текущего пароля при смене пароля
|
||||
if ($request->has('password')) {
|
||||
if (!Hash::check($request->current_password, $user->password)) {
|
||||
if (! Hash::check($request->current_password, $user->password)) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Текущий пароль неверен'
|
||||
'message' => 'Текущий пароль неверен',
|
||||
], 422);
|
||||
}
|
||||
$user->password = Hash::make($request->password);
|
||||
@@ -179,7 +179,7 @@ class AuthController extends Controller
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Профиль обновлен',
|
||||
'user' => $user->only(['id', 'name', 'login', 'department', 'position', 'role', 'phone'])
|
||||
'user' => $user->only(['id', 'name', 'login', 'department', 'position', 'role', 'phone']),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -188,13 +188,13 @@ class AuthController extends Controller
|
||||
{
|
||||
$token = $request->bearerToken();
|
||||
|
||||
if (!$token) {
|
||||
if (! $token) {
|
||||
return response()->json(['valid' => false], 401);
|
||||
}
|
||||
|
||||
$accessToken = PersonalAccessToken::findToken($token);
|
||||
|
||||
if (!$accessToken || !$accessToken->tokenable) {
|
||||
if (! $accessToken || ! $accessToken->tokenable) {
|
||||
return response()->json(['valid' => false], 401);
|
||||
}
|
||||
|
||||
@@ -206,10 +206,10 @@ class AuthController extends Controller
|
||||
{
|
||||
$user = $request->user();
|
||||
|
||||
if (!$user->isAdmin()) {
|
||||
if (! $user->isAdmin()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Недостаточно прав'
|
||||
'message' => 'Недостаточно прав',
|
||||
], 403);
|
||||
}
|
||||
|
||||
@@ -219,7 +219,7 @@ class AuthController extends Controller
|
||||
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'users' => $users
|
||||
'users' => $users,
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -228,10 +228,10 @@ class AuthController extends Controller
|
||||
{
|
||||
$currentUser = $request->user();
|
||||
|
||||
if (!$currentUser->isAdmin()) {
|
||||
if (! $currentUser->isAdmin()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'message' => 'Недостаточно прав'
|
||||
'message' => 'Недостаточно прав',
|
||||
], 403);
|
||||
}
|
||||
|
||||
@@ -240,13 +240,13 @@ class AuthController extends Controller
|
||||
$validator = Validator::make($request->all(), [
|
||||
'is_active' => 'boolean',
|
||||
'role' => 'in:doctor,nurse,head_of_department,statistician,admin',
|
||||
'department' => 'string'
|
||||
'department' => 'string',
|
||||
]);
|
||||
|
||||
if ($validator->fails()) {
|
||||
return response()->json([
|
||||
'success' => false,
|
||||
'errors' => $validator->errors()
|
||||
'errors' => $validator->errors(),
|
||||
], 422);
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@ class AuthController extends Controller
|
||||
return response()->json([
|
||||
'success' => true,
|
||||
'message' => 'Пользователь обновлен',
|
||||
'user' => $user->only(['id', 'name', 'login', 'department', 'position', 'role', 'is_active'])
|
||||
'user' => $user->only(['id', 'name', 'login', 'department', 'position', 'role', 'is_active']),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user