Merge branch 'master' into VORKOUT-7
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
from typing import Optional
|
||||
from sqlalchemy.ext.asyncio import AsyncConnection
|
||||
from api.db.logic.auth import get_user
|
||||
|
||||
# # from backend.schemas.users.token import TokenData
|
||||
from api.schemas.account.account import User
|
||||
from api.db.tables.account import AccountStatus
|
||||
@@ -8,13 +9,8 @@ from api.db.tables.account import AccountStatus
|
||||
from api.utils.hasher import Hasher
|
||||
|
||||
|
||||
|
||||
|
||||
async def authenticate_user(
|
||||
connection: AsyncConnection, username: str, password: str
|
||||
) -> Optional[User]:
|
||||
|
||||
sql_user,sql_password = await get_user(connection, username)
|
||||
async def authenticate_user(connection: AsyncConnection, username: str, password: str) -> Optional[User]:
|
||||
sql_user, sql_password = await get_user(connection, username)
|
||||
|
||||
if not sql_user or sql_user.status != AccountStatus.ACTIVE :
|
||||
return None
|
||||
|
Reference in New Issue
Block a user