From 2a88240dd91dc693fc884c78e61d270b034de9bc Mon Sep 17 00:00:00 2001 From: tsygankoviva Date: Thu, 16 Jul 2026 14:40:34 +0300 Subject: [PATCH] =?UTF-8?q?deleted-user-auth-fix:=20=D1=83=D0=B4=D0=B0?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=BD=D0=B5?= =?UTF-8?q?=20=D0=BC=D0=BE=D0=B6=D0=B5=D1=82=20=D0=B0=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/src/api/v1/deps.py | 4 ++-- api/src/services/auth_service.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/api/v1/deps.py b/api/src/api/v1/deps.py index 886297f..1093752 100644 --- a/api/src/api/v1/deps.py +++ b/api/src/api/v1/deps.py @@ -36,9 +36,9 @@ async def get_user_by_token( user_repo = UserRepository(db) user = await user_repo.get_by_username(username) - if user is None: + if user is None or not user.is_active: user = await user_repo.get_by_email(username) - if user is None: + if user is None or not user.is_active: raise HTTPException( status_code=status.HTTP_401_UNAUTHORIZED, detail="Пользователь не найден", diff --git a/api/src/services/auth_service.py b/api/src/services/auth_service.py index e1c926d..1f0e37f 100644 --- a/api/src/services/auth_service.py +++ b/api/src/services/auth_service.py @@ -14,7 +14,7 @@ class AuthService: async def authenticate_user(self, username: str, password: str) -> Optional[Token]: user = await self.user_repo.authenticate(username, password) - if not user: + if not user or not user.is_active: return None access_token = create_access_token(data={"sub": user.username}) refresh_token = create_refresh_token(data={"sub": user.username}) @@ -26,7 +26,7 @@ class AuthService: async def authenticate_user_via_email(self, email: str) -> Optional[Token]: user = await self.user_repo.authenticate_via_email(email) - if not user: + if not user or not user.is_active: return None access_token = create_access_token(data={"sub": user.email}) refresh_token = create_refresh_token(data={"sub": user.email})