forked from polka_billy/porridger
making async api - 2
This commit is contained in:
@ -14,10 +14,13 @@ from dotenv import load_dotenv
|
||||
from .db import SessionLocal
|
||||
from . import orm_models, pydantic_schemas
|
||||
|
||||
load_dotenv("unimportant.env")
|
||||
SECRET_KEY = os.getenv("SECRET_KEY")
|
||||
ALGORITHM = os.getenv("ALGORITHM")
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES = os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES")
|
||||
# load_dotenv("unimportant.env")
|
||||
# SECRET_KEY = os.getenv("SECRET_KEY")
|
||||
# ALGORITHM = os.getenv("ALGORITHM")
|
||||
# ACCESS_TOKEN_EXPIRE_MINUTES = os.getenv("ACCESS_TOKEN_EXPIRE_MINUTES")
|
||||
ACCESS_TOKEN_EXPIRE_MINUTES = 1440
|
||||
SECRET_KEY = "651a52941cf5de14d48ef5d7af115709"
|
||||
ALGORITHM = "HS256"
|
||||
pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
|
||||
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/token")
|
||||
|
||||
@ -36,7 +39,7 @@ async def get_password_hash(password):
|
||||
|
||||
|
||||
async def get_user_by_nickname(db: Annotated[AsyncSession, Depends(get_session)], nickname: str):
|
||||
query = db.execute(select(orm_models.User).where(orm_models.User.nickname == nickname))
|
||||
query = await db.execute(select(orm_models.User).where(orm_models.User.nickname == nickname))
|
||||
user_with_required_nickname = query.scalars().first()
|
||||
if user_with_required_nickname:
|
||||
return user_with_required_nickname
|
||||
@ -44,7 +47,7 @@ async def get_user_by_nickname(db: Annotated[AsyncSession, Depends(get_session)]
|
||||
|
||||
|
||||
async def get_user_by_id(db: Annotated[AsyncSession, Depends(get_session)], user_id: int):
|
||||
query = db.execute(select(orm_models.User).where(orm_models.User.id == user_id))
|
||||
query = await db.execute(select(orm_models.User).where(orm_models.User.id == user_id))
|
||||
user_with_required_id = query.scalars().first()
|
||||
if user_with_required_id:
|
||||
return user_with_required_id
|
||||
@ -67,7 +70,7 @@ async def create_access_token(data: dict, expires_delta: Union[timedelta, None]
|
||||
else:
|
||||
expire = datetime.utcnow() + timedelta(minutes=15)
|
||||
to_encode.update({"exp": expire})
|
||||
encoded_jwt = await jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
||||
encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
|
||||
return encoded_jwt
|
||||
|
||||
|
||||
@ -78,8 +81,8 @@ async def get_current_user(db: Annotated[AsyncSession, Depends(get_session)], to
|
||||
headers={"WWW-Authenticate": "Bearer"},
|
||||
)
|
||||
try:
|
||||
payload = await jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
|
||||
user_id: int = await payload.get("user_id")
|
||||
payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
|
||||
user_id: int = payload.get("user_id")
|
||||
if user_id is None:
|
||||
raise credentials_exception
|
||||
token_data = pydantic_schemas.TokenData(user_id=user_id)
|
||||
|
Reference in New Issue
Block a user