feat(auth): JWT TokenPayload accepts wid + role
TokenPayload gains optional wid (workspace_id) and role claims; create_access_token accepts them as keyword-only args and only encodes them when provided. Existing tokens and existing callers keep working unchanged — the contract that protected requests must carry wid is enforced by middleware (PR4 T4.6/T4.7), not by the JWT type system. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
"""JWT token creation and verification."""
|
||||
|
||||
from datetime import UTC, datetime, timedelta
|
||||
from typing import Any
|
||||
|
||||
import jwt
|
||||
from pydantic import BaseModel
|
||||
@@ -10,30 +11,51 @@ from app.gateway.auth.errors import TokenError
|
||||
|
||||
|
||||
class TokenPayload(BaseModel):
|
||||
"""JWT token payload."""
|
||||
"""JWT token payload.
|
||||
|
||||
`wid` / `role` were added in Stage 0 PR4 and are optional at the
|
||||
model level so legacy 4-field tokens still parse into a value —
|
||||
callers (middleware, decode_token) decide what "missing wid" means.
|
||||
Post-PR4 production tokens always carry both fields.
|
||||
"""
|
||||
|
||||
sub: str # user_id
|
||||
wid: str | None = None # workspace_id (Stage 0 PR4)
|
||||
role: str | None = None # owner / admin / member (Stage 0 PR4)
|
||||
exp: datetime
|
||||
iat: datetime | None = None
|
||||
ver: int = 0 # token_version — must match User.token_version
|
||||
|
||||
|
||||
def create_access_token(user_id: str, expires_delta: timedelta | None = None, token_version: int = 0) -> str:
|
||||
def create_access_token(
|
||||
user_id: str,
|
||||
expires_delta: timedelta | None = None,
|
||||
token_version: int = 0,
|
||||
*,
|
||||
workspace_id: str | None = None,
|
||||
role: str | None = None,
|
||||
) -> str:
|
||||
"""Create a JWT access token.
|
||||
|
||||
Args:
|
||||
user_id: The user's UUID as string
|
||||
expires_delta: Optional custom expiry, defaults to 7 days
|
||||
token_version: User's current token_version for invalidation
|
||||
user_id: The user's UUID as string.
|
||||
expires_delta: Optional custom expiry, defaults to 7 days.
|
||||
token_version: User's current token_version for invalidation.
|
||||
workspace_id: Optional active workspace id; encoded as the ``wid`` claim.
|
||||
role: Optional workspace role; encoded as the ``role`` claim.
|
||||
|
||||
Returns:
|
||||
Encoded JWT string
|
||||
Encoded JWT string.
|
||||
"""
|
||||
config = get_auth_config()
|
||||
expiry = expires_delta or timedelta(days=config.token_expiry_days)
|
||||
|
||||
now = datetime.now(UTC)
|
||||
payload = {"sub": user_id, "exp": now + expiry, "iat": now, "ver": token_version}
|
||||
payload: dict[str, Any] = {"sub": user_id, "exp": now + expiry, "iat": now, "ver": token_version}
|
||||
if workspace_id is not None:
|
||||
payload["wid"] = workspace_id
|
||||
if role is not None:
|
||||
payload["role"] = role
|
||||
return jwt.encode(payload, config.jwt_secret, algorithm="HS256")
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user