Skip to content

Commit a16aaaa

Browse files
committed
fix: swagger login schema
1 parent 5f411ce commit a16aaaa

2 files changed

Lines changed: 21 additions & 19 deletions

File tree

src/core/dependency/auth.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
from uuid import UUID
22

33
from fastapi import Depends, HTTPException, Request, status
4-
from fastapi.security import OAuth2PasswordBearer
4+
from fastapi.security import HTTPBearer
55
from sqlalchemy.ext.asyncio import AsyncSession
66

77
from src.core.database.postgres.session import get_db
88
from src.modules.user.infrastructure.repositories.user_repository import (
99
SQLAlchemyUserRepository,
1010
)
1111

12-
oauth2_scheme = OAuth2PasswordBearer(
13-
tokenUrl="/api/v1/auth/login",
14-
refreshUrl="/api/v1/auth/refresh",
15-
)
12+
# oauth2_scheme = OAuth2PasswordBearer(
13+
# tokenUrl="/api/v1/auth/login",
14+
# refreshUrl="/api/v1/auth/refresh",
15+
# )
16+
17+
oauth2_scheme = HTTPBearer(scheme_name="Authorization", auto_error=False)
1618

1719

1820
async def get_current_user(

src/modules/user/presentation/routers/user_router.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from fastapi import APIRouter, Depends, HTTPException, Request, status
1+
from fastapi import APIRouter, Depends, HTTPException, Request, status
22
from fastapi.security import OAuth2PasswordRequestForm
33

44
from src.core.authorization.dependencies import require_permission
@@ -129,16 +129,16 @@ async def get_me(
129129

130130

131131
@router.post("/logout", status_code=status.HTTP_204_NO_CONTENT)
132-
async def logout(
133-
request: Request,
134-
current_user: dict = Depends(require_permission(USER_RESOURCE, UPDATE_ACTION)),
135-
handler: LogoutUserCommandHandler = Depends(get_logout_handler),
136-
):
137-
auth_header = request.headers.get("Authorization", "")
138-
access_token = auth_header.removeprefix("Bearer ").strip()
139-
await handler.execute(
140-
LogoutUserCommand(
141-
user_id=str(current_user.get("id")),
142-
access_token=access_token,
143-
)
144-
)
132+
async def logout(
133+
request: Request,
134+
current_user: dict = Depends(require_permission(USER_RESOURCE, UPDATE_ACTION)),
135+
handler: LogoutUserCommandHandler = Depends(get_logout_handler),
136+
):
137+
auth_header = request.headers.get("Authorization", "")
138+
access_token = auth_header.removeprefix("Bearer ").strip()
139+
await handler.execute(
140+
LogoutUserCommand(
141+
user_id=str(current_user.get("id")),
142+
access_token=access_token,
143+
)
144+
)

0 commit comments

Comments
 (0)