From ba3ed4d4225420e816466062073ac47821ef6a7b Mon Sep 17 00:00:00 2001 From: urec56 Date: Mon, 3 Jun 2024 13:57:50 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=20=D0=B0=D0=B2=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/users/router.py | 8 +++----- app/users/schemas.py | 4 ---- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/users/router.py b/app/users/router.py index 870c5f0..8e1cd62 100644 --- a/app/users/router.py +++ b/app/users/router.py @@ -18,7 +18,6 @@ from app.users.schemas import ( SUserLogin, SUserRegister, SUserResponse, - SUserToken, SEmailVerification, SUserAvatars, SUsername, @@ -73,7 +72,7 @@ async def check_existing_email(email: SEmail, uow=Depends(UnitOfWork)): @router.post( "/register", status_code=status.HTTP_201_CREATED, - response_model=SUserToken, + response_model=None, ) async def register_user(response: Response, user_data: SUserRegister, uow=Depends(UnitOfWork)): if user_data.password != user_data.password2: @@ -98,8 +97,7 @@ async def register_user(response: Response, user_data: SUserRegister, uow=Depend await RedisService.set_verification_code(redis=redis_session, user_id=user_id, verification_code=user_code) user = await AuthService.authenticate_user_by_email(uow, user_data.email, user_data.password) access_token = create_access_token({"sub": str(user.id)}) - response.set_cookie(key="black_phoenix_access_token", value=access_token, httponly=True, secure=True) - return {"access_token": access_token} + response.headers["Authorization"] = f"Bearer {access_token}" @router.get( @@ -126,7 +124,7 @@ async def email_verification(user_code: str, uow=Depends(UnitOfWork)): @router.post( "/login", status_code=status.HTTP_200_OK, - response_model=SUserToken, + response_model=None, ) async def login_user(response: Response, user_data: SUserLogin, uow=Depends(UnitOfWork)): user = await AuthService.authenticate_user(uow, user_data.email_or_username, user_data.password) diff --git a/app/users/schemas.py b/app/users/schemas.py index 9bd4c0b..0a91e6a 100644 --- a/app/users/schemas.py +++ b/app/users/schemas.py @@ -94,10 +94,6 @@ class SEmailVerification(BaseModel): email_verification: bool -class SUserToken(BaseModel): - access_token: str - - class SConfirmPasswordRecovery(BaseModel): user_id: int