Skip to content

unify auth cookie persistence #188

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chriscarrollsmith merged 1 commit into from
Jun 7, 2026
Merged

unify auth cookie persistence #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 6 additions & 14 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
get_user_from_request,
require_unauthenticated_client,
)
from utils.core.auth import COOKIE_SECURE
from utils.core.auth import refresh_token_is_persistent, set_auth_cookies
from utils.core.htmx import (
is_htmx_request,
toast_response,
Expand Down Expand Up @@ -170,19 +170,11 @@ async def needs_new_tokens_handler(request: Request, exc: NeedsNewTokens):
response = RedirectResponse(
url=redirect_url, status_code=status.HTTP_307_TEMPORARY_REDIRECT
)
response.set_cookie(
key="access_token",
value=exc.access_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
)
response.set_cookie(
key="refresh_token",
value=exc.refresh_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
set_auth_cookies(
response,
exc.access_token,
exc.refresh_token,
persistent=refresh_token_is_persistent(exc.refresh_token),
)
return response

Expand Down
125 changes: 47 additions & 78 deletions routers/core/account.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,15 @@
from utils.core.auth import (
HTML_PASSWORD_PATTERN,
COMPILED_PASSWORD_PATTERN,
COOKIE_SECURE,
MAX_EMAILS_PER_ACCOUNT,
oauth2_scheme_cookie,
get_password_hash,
create_access_token,
create_tracked_refresh_token,
revoke_all_refresh_tokens,
validate_token,
set_auth_cookies,
clear_auth_cookies,
send_reset_email_task,
send_email_verification,
send_email_verified_notification,
Expand Down Expand Up @@ -127,8 +128,7 @@ def logout(
Log out a user by revoking their refresh token and clearing cookies.
"""
response = RedirectResponse(url="/", status_code=303)
response.delete_cookie("access_token")
response.delete_cookie("refresh_token")
clear_auth_cookies(response)

_, refresh_token_value = tokens
if refresh_token_value:
Expand Down Expand Up @@ -382,7 +382,9 @@ async def register(

# Create access token using the committed account's email
access_token = create_access_token(data={"sub": account.email, "fresh": True})
refresh_token = create_tracked_refresh_token(account.id, account.email, session)
refresh_token = create_tracked_refresh_token(
account.id, account.email, session, persistent=False
)
session.commit()

# Set cookie — use HX-Redirect for HTMX, 303 for regular form submissions
Expand All @@ -391,19 +393,11 @@ async def register(
response.headers["HX-Redirect"] = str(redirect_url)
else:
response = RedirectResponse(url=str(redirect_url), status_code=303)
response.set_cookie(
key="access_token",
value=access_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
)
response.set_cookie(
key="refresh_token",
value=refresh_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
set_auth_cookies(
response,
access_token,
refresh_token,
persistent=False,
)

return response
Expand All @@ -417,6 +411,7 @@ async def login(
account_and_session: Tuple[Account, Session] = Depends(
get_account_from_credentials
),
remember: Optional[str] = Form(None),
invitation_token: Optional[str] = Form(
None,
title="Invitation token",
Expand Down Expand Up @@ -507,8 +502,11 @@ async def login(

# Create access token
assert account.id is not None
persistent = remember == "on"
access_token = create_access_token(data={"sub": account.email, "fresh": True})
refresh_token = create_tracked_refresh_token(account.id, account.email, session)
refresh_token = create_tracked_refresh_token(
account.id, account.email, session, persistent=persistent
)
session.commit()

# Set cookie — use HX-Redirect for HTMX, 303 for regular form submissions
Expand All @@ -517,19 +515,11 @@ async def login(
response.headers["HX-Redirect"] = str(redirect_url)
else:
response = RedirectResponse(url=str(redirect_url), status_code=303)
response.set_cookie(
key="access_token",
value=access_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
)
response.set_cookie(
key="refresh_token",
value=refresh_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
set_auth_cookies(
response,
access_token,
refresh_token,
persistent=persistent,
)

return response
Expand All @@ -553,8 +543,7 @@ async def refresh_token(
response = RedirectResponse(
url=router.url_path_for("read_login"), status_code=303
)
response.delete_cookie("access_token")
response.delete_cookie("refresh_token")
clear_auth_cookies(response)
return response

# Validate JTI server-side
Expand All @@ -563,8 +552,7 @@ async def refresh_token(
response = RedirectResponse(
url=router.url_path_for("read_login"), status_code=303
)
response.delete_cookie("access_token")
response.delete_cookie("refresh_token")
clear_auth_cookies(response)
return response

user_email = decoded_token.get("sub")
Expand All @@ -591,32 +579,26 @@ async def refresh_token(
response = RedirectResponse(
url=router.url_path_for("read_login"), status_code=303
)
response.delete_cookie("access_token")
response.delete_cookie("refresh_token")
clear_auth_cookies(response)
return response

# Revoke current token and issue new ones
db_token.revoked = True
persistent = bool(decoded_token.get("persistent", False))
new_access_token = create_access_token(data={"sub": account.email, "fresh": False})
new_refresh_token = create_tracked_refresh_token(account.id, account.email, session)
new_refresh_token = create_tracked_refresh_token(
account.id, account.email, session, persistent=persistent
)
session.commit()

response = RedirectResponse(
url=dashboard_router.url_path_for("read_dashboard"), status_code=303
)
response.set_cookie(
key="access_token",
value=new_access_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
)
response.set_cookie(
key="refresh_token",
value=new_refresh_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
set_auth_cookies(
response,
new_access_token,
new_refresh_token,
persistent=persistent,
)

return response
Expand Down Expand Up @@ -696,7 +678,7 @@ async def reset_password(
data={"sub": authorized_account.email, "fresh": True}
)
refresh_token = create_tracked_refresh_token(
authorized_account.id, authorized_account.email, session
authorized_account.id, authorized_account.email, session, persistent=False
)
session.commit()

Expand All @@ -709,19 +691,11 @@ async def reset_password(
else:
response = RedirectResponse(url=redirect_url, status_code=303)

response.set_cookie(
key="access_token",
value=access_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
)
response.set_cookie(
key="refresh_token",
value=refresh_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="strict",
set_auth_cookies(
response,
access_token,
refresh_token,
persistent=False,
)
set_flash_cookie(response, message)
return response
Expand Down Expand Up @@ -961,7 +935,9 @@ async def promote_email(

# Issue new tokens with the new primary email
access_token = create_access_token(data={"sub": account.email, "fresh": True})
refresh_token = create_tracked_refresh_token(account.id, account.email, session)
refresh_token = create_tracked_refresh_token(
account.id, account.email, session, persistent=False
)
session.commit()

# Create recovery token and send notification to the old primary
Expand All @@ -979,18 +955,11 @@ async def promote_email(
else:
response = RedirectResponse(url=str(profile_path), status_code=303)
set_flash_cookie(response, "Primary email address updated.")
response.set_cookie(
key="access_token",
value=access_token,
httponly=True,
secure=COOKIE_SECURE,
samesite="lax",
)
response.set_cookie(
key="refresh_token",
value=refresh_token,
httponly=True,
secure=COOKIE_SECURE,
set_auth_cookies(
response,
access_token,
refresh_token,
persistent=False,
samesite="lax",
)
return response
Expand Down
Loading
Loading