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
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ async def dispatch(self, request: Request, call_next):
current_token = request.cookies.get(COOKIE_NAME_JWT_TOKEN)
try:
if current_token:
new_user = await self._refresh_user(current_token)
if new_user:
request.state.user = new_user
new_user, current_user = await self._refresh_user(current_token)
if user := (new_user or current_user):
request.state.user = user

response = await call_next(request)

Expand All @@ -67,9 +67,10 @@ async def dispatch(self, request: Request, call_next):
return response

@staticmethod
async def _refresh_user(current_token: str) -> BaseUser | None:
async def _refresh_user(current_token: str) -> tuple[BaseUser | None, BaseUser | None]:
try:
user = await resolve_user_from_token(current_token)
except HTTPException:
return None
return get_auth_manager().refresh_user(user=user)
return None, None

return get_auth_manager().refresh_user(user=user), user
1 change: 1 addition & 0 deletions devel-common/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ dependencies = [
"types-setuptools>=69.5.0.20240423",
"types-tabulate>=0.9.0.20240106",
"types-toml>=0.10.8.20240310",
"types-cachetools>=6.2.0.20251022",
]
"pytest" = [
# General pytest devel tools
Expand Down