andrei/visus-plus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: Улучшена аутентификация и приватные маршруты

Browse Source 
fix: Исправлены сообщения об ошибках аутентификации

chore: Добавлена сортировка пользователей по ID
This commit is contained in:
Андрей Дувакин 2025-06-29 11:36:32 +05:00
parent aadc4bf5bd
commit 67963bd395
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/app/application/users_repository.py
View File

@ -15,6 +15,7 @@ class UsersRepository:
stmt = ( stmt = (
select(User) select(User)
.options(joinedload(User.role)) .options(joinedload(User.role))
.order_by(User.id)
) )
result = await self.db.execute(stmt) result = await self.db.execute(stmt)
return result.scalars().all() return result.scalars().all()

11
api/app/infrastructure/dependencies.py
View File

@ -21,17 +21,20 @@ async def get_current_user(
try: try:
payload = jwt.decode(credentials.credentials, auth_data["secret_key"], algorithms=[auth_data["algorithm"]]) payload = jwt.decode(credentials.credentials, auth_data["secret_key"], algorithms=[auth_data["algorithm"]])
except jwt.ExpiredSignatureError: except jwt.ExpiredSignatureError:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Token has expired") raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Срок действия токена истек")
except jwt.InvalidTokenError: except jwt.InvalidTokenError:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token") raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Неправильный токен")
user_id = payload.get("user_id") user_id = payload.get("user_id")
if user_id is None: if user_id is None:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid token") raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Неправильный токен")
user = await UsersRepository(db).get_by_id_with_role(user_id) user = await UsersRepository(db).get_by_id_with_role(user_id)
if user is None: if user is None:
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="User not found") raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Пользователь не найден")
if user.is_blocked:
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Пользователь заблокирован")
return user return user