trying to make api work - 1

back/auth_utils.py

@@ -36,21 +36,23 @@ async def get_password_hash(password):
 
 
 async def get_user_by_nickname(db: Annotated[AsyncSession, Depends(get_session)], nickname: str):
-    user_with_required_id = db.select(orm_models.User).where(orm_models.User.nickname == nickname).first()
-    if user_with_required_id:
-        return user_with_required_id
+    query = 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
     return None
 
 
 async def get_user_by_id(db: Annotated[AsyncSession, Depends(get_session)], user_id: int):
-    user_with_required_id = db.select(orm_models.User).where(orm_models.User.id == user_id).first()
+    query = 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
     return None
     
 
 async def authenticate_user(db: Annotated[AsyncSession, Depends(get_session)], nickname: str, password: str):
-    user = get_user_by_nickname(db=db, nickname=nickname)
+    user = await get_user_by_nickname(db=db, nickname=nickname)
     if not user:
         return False
     if not verify_password(password, user.hashed_password):
@@ -65,7 +67,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 = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
+    encoded_jwt = await jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
     return encoded_jwt
 
 
@@ -76,14 +78,14 @@ async def get_current_user(db: Annotated[AsyncSession, Depends(get_session)], to
         headers={"WWW-Authenticate": "Bearer"},
     )
     try:
-        payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
-        user_id: int = payload.get("user_id")
+        payload = await jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
+        user_id: int = await payload.get("user_id")
         if user_id is None:
             raise credentials_exception
         token_data = pydantic_schemas.TokenData(user_id=user_id)
     except JWTError:
         raise credentials_exception
-    user = get_user_by_id(db, user_id=token_data.user_id)
+    user = await get_user_by_id(db, user_id=token_data.user_id)
     if user is None:
         raise credentials_exception
     return pydantic_schemas.User(id=user.id, nickname=user.nickname, name=user.name, surname=user.surname,