Compare commits
No commits in common. "520d64c04d19b7f6404b2a8e1f55b592df035dc9" and "c9346e52195fd1a8fcf6dde5a18c1158248d70bc" have entirely different histories.
520d64c04d
...
c9346e5219
@ -36,9 +36,9 @@ async def get_user_by_token(
|
|||||||
|
|
||||||
user_repo = UserRepository(db)
|
user_repo = UserRepository(db)
|
||||||
user = await user_repo.get_by_username(username)
|
user = await user_repo.get_by_username(username)
|
||||||
if user is None or not user.is_active:
|
if user is None:
|
||||||
user = await user_repo.get_by_email(username)
|
user = await user_repo.get_by_email(username)
|
||||||
if user is None or not user.is_active:
|
if user is None:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
detail="Пользователь не найден",
|
detail="Пользователь не найден",
|
||||||
|
|||||||
@ -14,7 +14,7 @@ class AuthService:
|
|||||||
|
|
||||||
async def authenticate_user(self, username: str, password: str) -> Optional[Token]:
|
async def authenticate_user(self, username: str, password: str) -> Optional[Token]:
|
||||||
user = await self.user_repo.authenticate(username, password)
|
user = await self.user_repo.authenticate(username, password)
|
||||||
if not user or not user.is_active:
|
if not user:
|
||||||
return None
|
return None
|
||||||
access_token = create_access_token(data={"sub": user.username})
|
access_token = create_access_token(data={"sub": user.username})
|
||||||
refresh_token = create_refresh_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]:
|
async def authenticate_user_via_email(self, email: str) -> Optional[Token]:
|
||||||
user = await self.user_repo.authenticate_via_email(email)
|
user = await self.user_repo.authenticate_via_email(email)
|
||||||
if not user or not user.is_active:
|
if not user:
|
||||||
return None
|
return None
|
||||||
access_token = create_access_token(data={"sub": user.email})
|
access_token = create_access_token(data={"sub": user.email})
|
||||||
refresh_token = create_refresh_token(data={"sub": user.email})
|
refresh_token = create_refresh_token(data={"sub": user.email})
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user