1. Fix SSE URL mismatch (CRITICAL):
- Frontend was connecting to /events instead of /events/stream
- Updated useProjectEvents.ts to use correct endpoint path
2. Fix SSE token authentication (CRITICAL):
- EventSource API doesn't support custom headers
- Added get_current_user_sse dependency that accepts tokens from:
- Authorization header (preferred, for non-EventSource clients)
- Query parameter 'token' (fallback for browser EventSource)
- Updated SSE endpoint to use new auth dependency
- Both auth methods now work correctly
Files changed:
- backend/app/api/dependencies/auth.py: +80 lines (new SSE auth)
- backend/app/api/routes/events.py: +23 lines (query param support)
- frontend/src/lib/hooks/useProjectEvents.ts: +5 lines (URL fix)
All 20 backend SSE tests pass.
All 17 frontend useProjectEvents tests pass.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
234 lines
6.9 KiB
Python
Executable File
234 lines
6.9 KiB
Python
Executable File
from fastapi import Depends, Header, HTTPException, status
|
|
from fastapi.security import OAuth2PasswordBearer
|
|
from fastapi.security.utils import get_authorization_scheme_param
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
|
|
from app.core.auth import TokenExpiredError, TokenInvalidError, get_token_data
|
|
from app.core.database import get_db
|
|
from app.models.user import User
|
|
|
|
# OAuth2 configuration
|
|
oauth2_scheme = OAuth2PasswordBearer(tokenUrl="/api/v1/auth/login")
|
|
|
|
|
|
async def get_current_user(
|
|
db: AsyncSession = Depends(get_db), token: str = Depends(oauth2_scheme)
|
|
) -> User:
|
|
"""
|
|
Get the current authenticated user.
|
|
|
|
Args:
|
|
db: Database session
|
|
token: JWT token from request
|
|
|
|
Returns:
|
|
User: The authenticated user
|
|
|
|
Raises:
|
|
HTTPException: If authentication fails
|
|
"""
|
|
try:
|
|
# Decode token and get user ID
|
|
token_data = get_token_data(token)
|
|
|
|
# Get user from database
|
|
result = await db.execute(select(User).where(User.id == token_data.user_id))
|
|
user = result.scalar_one_or_none()
|
|
|
|
if not user:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
|
|
)
|
|
|
|
if not user.is_active:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN, detail="Inactive user"
|
|
)
|
|
|
|
return user
|
|
|
|
except TokenExpiredError:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Token expired",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
except TokenInvalidError:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Could not validate credentials",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
|
|
|
|
def get_current_active_user(current_user: User = Depends(get_current_user)) -> User:
|
|
"""
|
|
Check if the current user is active.
|
|
|
|
Args:
|
|
current_user: The current authenticated user
|
|
|
|
Returns:
|
|
User: The authenticated and active user
|
|
|
|
Raises:
|
|
HTTPException: If user is inactive
|
|
"""
|
|
if not current_user.is_active:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN, detail="Inactive user"
|
|
)
|
|
return current_user
|
|
|
|
|
|
def get_current_superuser(current_user: User = Depends(get_current_user)) -> User:
|
|
"""
|
|
Check if the current user is a superuser.
|
|
|
|
Args:
|
|
current_user: The current authenticated user
|
|
|
|
Returns:
|
|
User: The authenticated superuser
|
|
|
|
Raises:
|
|
HTTPException: If user is not a superuser
|
|
"""
|
|
if not current_user.is_superuser:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN, detail="Not enough permissions"
|
|
)
|
|
return current_user
|
|
|
|
|
|
async def get_optional_token(authorization: str = Header(None)) -> str | None:
|
|
"""
|
|
Get the token from the Authorization header without requiring it.
|
|
|
|
This is a custom dependency that doesn't raise an exception when no token is provided,
|
|
unlike the standard OAuth2PasswordBearer.
|
|
|
|
Args:
|
|
authorization: Authorization header value
|
|
|
|
Returns:
|
|
The token string if valid Bearer token is provided, None otherwise
|
|
"""
|
|
if not authorization:
|
|
return None
|
|
|
|
scheme, token = get_authorization_scheme_param(authorization)
|
|
if scheme.lower() != "bearer":
|
|
return None
|
|
|
|
return token
|
|
|
|
|
|
async def get_optional_current_user(
|
|
db: AsyncSession = Depends(get_db), token: str | None = Depends(get_optional_token)
|
|
) -> User | None:
|
|
"""
|
|
Get the current user if authenticated, otherwise return None.
|
|
Useful for endpoints that work with both authenticated and unauthenticated users.
|
|
|
|
Args:
|
|
db: Database session
|
|
token: JWT token from request
|
|
|
|
Returns:
|
|
User or None: The authenticated user or None
|
|
"""
|
|
if not token:
|
|
return None
|
|
|
|
try:
|
|
token_data = get_token_data(token)
|
|
result = await db.execute(select(User).where(User.id == token_data.user_id))
|
|
user = result.scalar_one_or_none()
|
|
if not user or not user.is_active:
|
|
return None
|
|
return user
|
|
except (TokenExpiredError, TokenInvalidError):
|
|
return None
|
|
|
|
|
|
async def get_current_user_sse(
|
|
db: AsyncSession = Depends(get_db),
|
|
authorization: str | None = Header(None),
|
|
token: str | None = None, # Query parameter - passed directly from route
|
|
) -> User:
|
|
"""
|
|
Get the current authenticated user for SSE endpoints.
|
|
|
|
SSE (Server-Sent Events) via EventSource API doesn't support custom headers,
|
|
so this dependency accepts tokens from either:
|
|
1. Authorization header (preferred, for non-EventSource clients)
|
|
2. Query parameter 'token' (fallback for EventSource compatibility)
|
|
|
|
Security note: Query parameter tokens appear in server logs and browser history.
|
|
Consider implementing short-lived SSE-specific tokens for production if this
|
|
is a concern. The current approach is acceptable for internal/trusted networks.
|
|
|
|
Args:
|
|
db: Database session
|
|
authorization: Authorization header (Bearer token)
|
|
token: Query parameter token (fallback for EventSource)
|
|
|
|
Returns:
|
|
User: The authenticated user
|
|
|
|
Raises:
|
|
HTTPException: If authentication fails
|
|
"""
|
|
# Try Authorization header first (preferred)
|
|
auth_token = None
|
|
if authorization:
|
|
scheme, param = get_authorization_scheme_param(authorization)
|
|
if scheme.lower() == "bearer" and param:
|
|
auth_token = param
|
|
|
|
# Fall back to query parameter if no header token
|
|
if not auth_token and token:
|
|
auth_token = token
|
|
|
|
if not auth_token:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Not authenticated",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
|
|
try:
|
|
# Decode token and get user ID
|
|
token_data = get_token_data(auth_token)
|
|
|
|
# Get user from database
|
|
result = await db.execute(select(User).where(User.id == token_data.user_id))
|
|
user = result.scalar_one_or_none()
|
|
|
|
if not user:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_404_NOT_FOUND, detail="User not found"
|
|
)
|
|
|
|
if not user.is_active:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN, detail="Inactive user"
|
|
)
|
|
|
|
return user
|
|
|
|
except TokenExpiredError:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Token expired",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
except TokenInvalidError:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Could not validate credentials",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|