Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/api/auth.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
)
from src.auth.manager import UserManager, get_user_manager
from src.auth.schemas import (
AccessTokenResponse,
MessageResponse,
TokenResponse,
UserCreate,
Expand Down Expand Up @@ -100,7 +99,7 @@ async def refresh_jwt(
strategy=Depends(get_jwt_strategy),
refresh_manager: RefreshTokenManager = Depends(get_refresh_token_manager),
audit_service: AuditService = Depends(get_audit_service),
) -> AccessTokenResponse:
) -> TokenResponse:
user_agent, ip = extract_client_info(request)

user_id = await refresh_manager.verify_refresh_token(refresh_token)
Expand All @@ -126,6 +125,8 @@ async def refresh_jwt(
raise BusinessException(ErrorCode.USER_INACTIVE, "User inactive")

access_token = await strategy.write_token(user)
new_refresh_token = await refresh_manager.create_refresh_token(user.id, user_agent)
await refresh_manager.revoke_token(refresh_token)

await audit_service.log(
action=AuditAction.REFRESH,
Expand All @@ -135,7 +136,7 @@ async def refresh_jwt(
ip=ip,
)

return AccessTokenResponse(access_token=access_token, token_type="Bearer")
return TokenResponse(access_token=access_token, refresh_token=new_refresh_token)


@router.post("/jwt/logout")
Expand Down
2 changes: 0 additions & 2 deletions src/auth/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ async def current_superuser(
require_roles,
)
from .schemas import ( # noqa: E402
AccessTokenResponse,
MessageResponse,
TokenResponse,
UserCreate,
Expand All @@ -106,6 +105,5 @@ async def current_superuser(
"UserCreate",
"UserUpdate",
"TokenResponse",
"AccessTokenResponse",
"MessageResponse",
]
5 changes: 0 additions & 5 deletions src/auth/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,5 @@ class TokenResponse(BaseModel):
token_type: Literal["Bearer"] = "Bearer"


class AccessTokenResponse(BaseModel):
access_token: str
token_type: Literal["Bearer"] = "Bearer"


class MessageResponse(BaseModel):
detail: str
25 changes: 24 additions & 1 deletion tests/integration/test_auth_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,30 @@ async def test_refresh_token_success(test_client, test_user):
data = response.json()
assert "access_token" in data
assert data["token_type"] == "Bearer"
assert "refresh_token" not in data
assert "refresh_token" in data


async def test_refresh_token_rotation(test_client, test_user):
login_response = await test_client.post(
"/auth/jwt/login",
data={"username": "test@example.com", "password": "testpassword123"},
)
old_refresh_token = login_response.json()["refresh_token"]

refresh_response = await test_client.post(
"/auth/jwt/refresh", params={"refresh_token": old_refresh_token}
)
new_refresh_token = refresh_response.json()["refresh_token"]

old_token_response = await test_client.post(
"/auth/jwt/refresh", params={"refresh_token": old_refresh_token}
)
assert old_token_response.status_code == 401

new_token_response = await test_client.post(
"/auth/jwt/refresh", params={"refresh_token": new_refresh_token}
)
assert new_token_response.status_code == 200


async def test_refresh_token_invalid(test_client):
Expand Down
Loading