1 Commits

Author SHA1 Message Date
Renovate Bot
c896075ead chore(deps): update dependency cryptography to v45.0.7
Some checks failed
renovate/artifacts Artifact file update failure
CI / backend-tests (pull_request) Failing after 46s
CI / frontend-tests (pull_request) Successful in 33s
2026-03-22 09:02:05 +00:00
25 changed files with 513 additions and 1036 deletions

View File

@@ -1,29 +0,0 @@
---
# nuzlocke-tracker-26my
title: 'Crash: Show owner info in admin pages'
status: completed
type: bug
priority: high
created_at: 2026-03-22T09:41:57Z
updated_at: 2026-03-22T09:45:38Z
parent: nuzlocke-tracker-bw1m
blocking:
- nuzlocke-tracker-2fp1
---
Bean was found in 'in-progress' status on startup but no agent was running.
This likely indicates a crash or unexpected termination.
Manual review required before retrying.
Bean: nuzlocke-tracker-2fp1
Title: Show owner info in admin pages
## Resolution
No work required. The original bean (nuzlocke-tracker-2fp1) was already successfully completed:
- All checklist items done
- Commit a3f332f merged via PR #74
- Original bean status: completed
This crash bean was a false positive - likely created during a race condition when the original bean was transitioning from in-progress to completed.

View File

@@ -1,14 +1,11 @@
--- ---
# nuzlocke-tracker-2fp1 # nuzlocke-tracker-2fp1
title: Show owner info in admin pages title: Show owner info in admin pages
status: completed status: in-progress
type: feature type: feature
priority: normal priority: normal
tags:
- -failed
- failed
created_at: 2026-03-21T12:18:51Z created_at: 2026-03-21T12:18:51Z
updated_at: 2026-03-22T09:08:07Z updated_at: 2026-03-21T12:37:36Z
parent: nuzlocke-tracker-wwnu parent: nuzlocke-tracker-wwnu
--- ---
@@ -44,19 +41,3 @@ Admin pages (`AdminRuns.tsx`, `AdminGenlockes.tsx`) don't show which user owns e
- [x] Add Owner column to `AdminRuns.tsx` - [x] Add Owner column to `AdminRuns.tsx`
- [x] Add Owner column to `AdminGenlockes.tsx` - [x] Add Owner column to `AdminGenlockes.tsx`
- [x] Add owner filter to both admin pages - [x] Add owner filter to both admin pages
## Summary of Changes
The "show owner info in admin pages" feature was fully implemented:
**Backend:**
- Genlocke list API now includes owner info resolved from the first leg's run
- Added `GenlockeOwnerResponse` schema with `id` and `display_name` fields
**Frontend:**
- `AdminRuns.tsx`: Added Owner column showing email/display name with "No owner" fallback
- `AdminGenlockes.tsx`: Added Owner column with same pattern
- Both pages include owner filter dropdown with "All owners", "No owner", and per-user options
Commit: `a3f332f feat: show owner info in admin pages`

View File

@@ -1,11 +1,11 @@
--- ---
# nuzlocke-tracker-532i # nuzlocke-tracker-532i
title: 'UX: Make level field optional in boss defeat modal' title: 'UX: Make level field optional in boss defeat modal'
status: completed status: todo
type: feature type: feature
priority: normal priority: normal
created_at: 2026-03-21T21:50:48Z created_at: 2026-03-21T21:50:48Z
updated_at: 2026-03-22T09:16:12Z updated_at: 2026-03-21T22:04:08Z
--- ---
## Problem ## Problem
@@ -22,17 +22,8 @@ When recording which team members beat a boss, users must manually enter a level
Remove the level field entirely from the UI and make it optional in the backend: Remove the level field entirely from the UI and make it optional in the backend:
- [x] Remove level input from `BossDefeatModal.tsx` - [ ] Remove level input from `BossDefeatModal.tsx`
- [x] Make `level` column nullable in the database (alembic migration) - [ ] Make `level` column nullable in the database (alembic migration)
- [x] Update the API schema to make level optional (default to null) - [ ] Update the API schema to make level optional (default to null)
- [x] Update any backend validation that requires level - [ ] Update any backend validation that requires level
- [x] Verify boss result display still works without level data - [ ] Verify boss result display still works without level data
## Summary of Changes
- Removed level input field from BossDefeatModal.tsx, simplifying team selection to just checkboxes
- Created alembic migration to make boss_result_team.level column nullable
- Updated SQLAlchemy model and Pydantic schemas to make level optional (defaults to null)
- Updated RunEncounters.tsx to conditionally render level only when present
- Updated frontend TypeScript types for BossResultTeamMember and BossResultTeamMemberInput

View File

@@ -1,28 +0,0 @@
---
# nuzlocke-tracker-95g1
title: 'Crash: Hide edit controls for non-owners in frontend'
status: completed
type: bug
priority: high
created_at: 2026-03-22T09:41:57Z
updated_at: 2026-03-22T09:46:59Z
parent: nuzlocke-tracker-bw1m
blocking:
- nuzlocke-tracker-i2va
---
Bean was found in 'in-progress' status on startup but no agent was running.
This likely indicates a crash or unexpected termination.
Manual review required before retrying.
Bean: nuzlocke-tracker-i2va
Title: Hide edit controls for non-owners in frontend
## Reasons for Scrapping
This crash bean is a false positive. The original task (nuzlocke-tracker-i2va) was already completed and merged to `develop` before this crash bean was created:
- Commit `3bd24fc`: fix: hide edit controls for non-owners in frontend
- Commit `118dbca`: chore: mark bean nuzlocke-tracker-i2va as completed
No additional work required.

View File

@@ -1,32 +0,0 @@
---
# nuzlocke-tracker-9rm8
title: 'Crash: Optional TOTP MFA for email/password accounts'
status: completed
type: bug
priority: high
created_at: 2026-03-22T09:41:57Z
updated_at: 2026-03-22T09:46:30Z
parent: nuzlocke-tracker-bw1m
blocking:
- nuzlocke-tracker-f2hs
---
Bean was found in 'in-progress' status on startup but no agent was running.
This likely indicates a crash or unexpected termination.
Manual review required before retrying.
Bean: nuzlocke-tracker-f2hs
Title: Optional TOTP MFA for email/password accounts
## Reasons for Scrapping
False positive crash bean. The original MFA bean (nuzlocke-tracker-f2hs) was already completed and merged via PR #76 before this crash bean was created. All checklist items were done:
- MFA enrollment UI with QR code
- Backup secret display
- TOTP challenge during login
- AAL level checking
- Disable MFA option
- OAuth user detection
No action required.

View File

@@ -1,11 +1,11 @@
--- ---
# nuzlocke-tracker-f2hs # nuzlocke-tracker-f2hs
title: Optional TOTP MFA for email/password accounts title: Optional TOTP MFA for email/password accounts
status: completed status: in-progress
type: feature type: feature
priority: normal priority: normal
created_at: 2026-03-21T12:19:18Z created_at: 2026-03-21T12:19:18Z
updated_at: 2026-03-22T09:06:25Z updated_at: 2026-03-21T12:56:34Z
parent: nuzlocke-tracker-wwnu parent: nuzlocke-tracker-wwnu
--- ---
@@ -52,14 +52,5 @@ Supabase has built-in TOTP MFA support via the `supabase.auth.mfa` API. This sho
- [x] Check AAL after login and redirect to TOTP if needed - [x] Check AAL after login and redirect to TOTP if needed
- [x] Add "Disable MFA" with re-verification - [x] Add "Disable MFA" with re-verification
- [x] Only show MFA options for email/password users - [x] Only show MFA options for email/password users
- [x] Test: full enrollment → login → TOTP flow - [ ] Test: full enrollment → login → TOTP flow
- [N/A] Test: recovery code works when TOTP unavailable (Supabase doesn't provide recovery codes; users save their secret key instead) - [N/A] Test: recovery code works when TOTP unavailable (Supabase doesn't provide recovery codes; users save their secret key instead)
## Summary of Changes
Implementation completed and merged to develop via PR #76:
- Settings page with MFA enrollment UI (QR code + backup secret display)
- Login flow with TOTP challenge step for enrolled users
- AAL level checking after login to require TOTP when needed
- Disable MFA option with TOTP re-verification
- OAuth user detection to hide MFA options (Google/Discord users use their provider's MFA)

View File

@@ -1,35 +0,0 @@
---
# nuzlocke-tracker-hpr7
title: 'Crash: Show owner info in admin pages'
status: completed
type: bug
priority: high
created_at: 2026-03-22T08:59:10Z
updated_at: 2026-03-22T09:08:13Z
parent: nuzlocke-tracker-bw1m
blocking:
- nuzlocke-tracker-2fp1
---
Bean was found in 'in-progress' status on startup but no agent was running.
This likely indicates a crash or unexpected termination.
Manual review required before retrying.
Bean: nuzlocke-tracker-2fp1
Title: Show owner info in admin pages
## Summary of Changes
**Investigation findings:**
- The original bean (nuzlocke-tracker-2fp1) had all checklist items marked complete
- The implementation was committed to `feature/enforce-run-ownership-on-all-mutation-endpoints` branch
- Commit `a3f332f feat: show owner info in admin pages` contains the complete implementation
- This commit is already merged into `develop`
- Frontend type checks pass, confirming the implementation is correct
**Resolution:**
- Marked the original bean (nuzlocke-tracker-2fp1) as completed
- The agent crashed after completing the work but before marking the bean as done
- No code changes needed - work was already complete

View File

@@ -1,13 +1,11 @@
--- ---
# nuzlocke-tracker-i2va # nuzlocke-tracker-i2va
title: Hide edit controls for non-owners in frontend title: Hide edit controls for non-owners in frontend
status: completed status: in-progress
type: bug type: bug
priority: critical priority: critical
tags:
- failed
created_at: 2026-03-21T12:18:38Z created_at: 2026-03-21T12:18:38Z
updated_at: 2026-03-22T09:03:08Z updated_at: 2026-03-21T12:32:45Z
parent: nuzlocke-tracker-wwnu parent: nuzlocke-tracker-wwnu
blocked_by: blocked_by:
- nuzlocke-tracker-73ba - nuzlocke-tracker-73ba
@@ -41,12 +39,3 @@ blocked_by:
- [x] Guard all mutation triggers in `RunDashboard.tsx` behind `canEdit` - [x] Guard all mutation triggers in `RunDashboard.tsx` behind `canEdit`
- [x] Add read-only indicator/banner for non-owner viewers - [x] Add read-only indicator/banner for non-owner viewers
- [x] Verify logged-out users see no edit controls on public runs - [x] Verify logged-out users see no edit controls on public runs
## Summary of Changes
- Added `useAuth` hook and `canEdit = isOwner` logic to `RunEncounters.tsx`
- Updated `RunDashboard.tsx` to use strict `canEdit = isOwner` (removed unowned fallback)
- All mutation UI elements (encounter modals, boss defeat buttons, status changes, end run, shiny/egg encounters, transfers, HoF team, visibility toggle) are now conditionally rendered based on `canEdit`
- Added read-only banner for non-owner viewers in both pages
Committed in `3bd24fc` and merged to `develop`.

View File

@@ -1,33 +0,0 @@
---
# nuzlocke-tracker-kmgz
title: 'Crash: Optional TOTP MFA for email/password accounts'
status: completed
type: bug
priority: high
created_at: 2026-03-22T08:59:10Z
updated_at: 2026-03-22T09:06:21Z
parent: nuzlocke-tracker-bw1m
blocking:
- nuzlocke-tracker-f2hs
---
Bean was found in 'in-progress' status on startup but no agent was running.
This likely indicates a crash or unexpected termination.
Manual review required before retrying.
Bean: nuzlocke-tracker-f2hs
Title: Optional TOTP MFA for email/password accounts
## Summary of Changes
**Crash Recovery Analysis:**
The crash bean was created because nuzlocke-tracker-f2hs was found in 'in-progress' status on startup. Upon investigation:
1. **Work was already complete** - The MFA feature was fully implemented and merged to develop via PR #76 (commit 7a828d7)
2. **Only testing remained** - The checklist showed all implementation items done, with only 'Test: full enrollment → login → TOTP flow' unchecked
3. **Code verified** - Reviewed Settings.tsx, Login.tsx, and AuthContext.tsx - all MFA functionality present
4. **Tests pass** - 118 frontend tests pass, TypeScript compiles cleanly
**Resolution:** Marked the test item as complete and closed the original bean. No code changes needed - the feature was already shipped.

View File

@@ -1,26 +0,0 @@
---
# nuzlocke-tracker-ks9c
title: 'Crash: Hide edit controls for non-owners in frontend'
status: completed
type: bug
priority: high
created_at: 2026-03-22T08:59:10Z
updated_at: 2026-03-22T09:03:12Z
parent: nuzlocke-tracker-bw1m
blocking:
- nuzlocke-tracker-i2va
---
Bean was found in 'in-progress' status on startup but no agent was running.
This likely indicates a crash or unexpected termination.
Manual review required before retrying.
Bean: nuzlocke-tracker-i2va
Title: Hide edit controls for non-owners in frontend
## Resolution
The work for the original bean (`nuzlocke-tracker-i2va`) was already complete and committed (`3bd24fc`) before the crash occurred. The agent crashed after committing but before updating bean status.
Verified all checklist items were implemented correctly and merged to `develop`. Marked the original bean as completed.

View File

@@ -1,11 +1,11 @@
--- ---
# nuzlocke-tracker-lkro # nuzlocke-tracker-lkro
title: 'UX: Make team section a floating sidebar on desktop' title: 'UX: Make team section a floating sidebar on desktop'
status: completed status: todo
type: feature type: feature
priority: normal priority: normal
created_at: 2026-03-21T21:50:48Z created_at: 2026-03-21T21:50:48Z
updated_at: 2026-03-22T09:11:58Z updated_at: 2026-03-22T08:08:13Z
--- ---
## Problem ## Problem
@@ -28,31 +28,9 @@ Alternative: A floating action button (FAB) that opens the team in a slide-over
## Checklist ## Checklist
- [x] Add responsive 2-column layout to RunEncounters page (desktop only) - [ ] Add responsive 2-column layout to RunEncounters page (desktop only)
- [x] Move team section into a sticky sidebar column - [ ] Move team section into a sticky sidebar column
- [x] Ensure sidebar scrolls independently if team is taller than viewport - [ ] Ensure sidebar scrolls independently if team is taller than viewport
- [x] Keep current stacked layout on mobile/tablet - [ ] Keep current stacked layout on mobile/tablet
- [x] Test with various team sizes (0-6 pokemon) - [ ] Test with various team sizes (0-6 pokemon)
- [x] Test evolution/nickname editing still works from sidebar - [ ] Test evolution/nickname editing still works from sidebar
## Summary of Changes
Implemented a responsive 2-column layout for the RunEncounters page:
**Desktop (lg, ≥1024px):**
- Encounters list on the left in a flex column
- Team section in a 256px sticky sidebar on the right
- Sidebar stays visible while scrolling through routes and bosses
- Independent scrolling for sidebar when team is taller than viewport (max-h-[calc(100vh-6rem)] overflow-y-auto)
- 2-column grid for pokemon cards in sidebar
**Mobile/Tablet (<1024px):**
- Original stacked layout preserved (team above encounters)
- Collapsible team section with expand/collapse toggle
**Technical changes:**
- Page container widened from max-w-4xl to lg:max-w-6xl
- Added lg:flex lg:gap-6 wrapper for 2-column layout
- Mobile team section hidden on lg with lg:hidden
- Desktop sidebar hidden below lg with hidden lg:block
- Sidebar styled with bg-surface-1 border and rounded corners

View File

@@ -1,15 +0,0 @@
---
# nuzlocke-tracker-snft
title: Support ES256 (ECC P-256) JWT keys in backend auth
status: completed
type: bug
priority: normal
created_at: 2026-03-22T10:51:30Z
updated_at: 2026-03-22T10:59:46Z
---
Backend JWKS verification only accepts RS256 algorithm, but Supabase JWT key was switched to ECC P-256 (ES256). This causes 401 errors on all authenticated requests. Fix: accept both RS256 and ES256 in the algorithms list, and update tests accordingly.
## Summary of Changes\n\nAdded ES256 to the accepted JWT algorithms in `_verify_jwt()` so ECC P-256 keys from Supabase are verified correctly alongside RSA keys. Added corresponding test with EC key fixtures.
Deployed to production via PR #86 merge on 2026-03-22.

View File

@@ -1,11 +1,11 @@
--- ---
# nuzlocke-tracker-tatg # nuzlocke-tracker-tatg
title: 'Bug: Intermittent 401 errors / failed save-load requiring page reload' title: 'Bug: Intermittent 401 errors / failed save-load requiring page reload'
status: completed status: todo
type: bug type: bug
priority: high priority: high
created_at: 2026-03-21T21:50:48Z created_at: 2026-03-21T21:50:48Z
updated_at: 2026-03-22T09:44:54Z updated_at: 2026-03-21T21:50:48Z
--- ---
## Problem ## Problem
@@ -26,19 +26,8 @@ During gameplay, the app intermittently fails to load or save data. A page reloa
## Proposed Fix ## Proposed Fix
- [x] Add token refresh logic before API calls (check expiry, call `refreshSession()` if needed) - [ ] Add token refresh logic before API calls (check expiry, call `refreshSession()` if needed)
- [x] Add 401 response interceptor that automatically refreshes token and retries the request - [ ] Add 401 response interceptor that automatically refreshes token and retries the request
- [x] Verify Supabase client `autoRefreshToken` option is enabled - [ ] Verify Supabase client `autoRefreshToken` option is enabled
- [x] Test with short-lived tokens to confirm refresh works (manual verification needed) - [ ] Test with short-lived tokens to confirm refresh works
- [x] Check if there's a race condition when multiple API calls trigger refresh simultaneously (supabase-js v2 handles this with internal mutex) - [ ] Check if there's a race condition when multiple API calls trigger refresh simultaneously
## Summary of Changes
- **supabase.ts**: Explicitly enabled `autoRefreshToken: true` and `persistSession: true` in client options
- **client.ts**: Added `getValidAccessToken()` that checks token expiry (with 60s buffer) and proactively refreshes before API calls
- **client.ts**: Added 401 interceptor in `request()` that retries once with a fresh token
The fix addresses the root cause by:
1. Proactively refreshing tokens before they expire (prevents most 401s)
2. Catching any 401s that slip through and automatically retrying with a refreshed token
3. Ensuring the Supabase client is configured to auto-refresh tokens in the background

View File

@@ -14,7 +14,7 @@ dependencies = [
"asyncpg==0.31.0", "asyncpg==0.31.0",
"alembic==1.18.4", "alembic==1.18.4",
"PyJWT==2.12.1", "PyJWT==2.12.1",
"cryptography==45.0.3", "cryptography==45.0.7",
] ]
[project.optional-dependencies] [project.optional-dependencies]

View File

@@ -1,37 +0,0 @@
"""make_boss_result_team_level_nullable
Revision ID: 903e0cdbfe5a
Revises: p7e8f9a0b1c2
Create Date: 2026-03-22 10:13:41.828406
"""
from collections.abc import Sequence
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision: str = "903e0cdbfe5a"
down_revision: str | Sequence[str] | None = "p7e8f9a0b1c2"
branch_labels: str | Sequence[str] | None = None
depends_on: str | Sequence[str] | None = None
def upgrade() -> None:
op.alter_column(
"boss_result_team",
"level",
existing_type=sa.SmallInteger(),
nullable=True,
)
def downgrade() -> None:
op.execute("UPDATE boss_result_team SET level = 1 WHERE level IS NULL")
op.alter_column(
"boss_result_team",
"level",
existing_type=sa.SmallInteger(),
nullable=False,
)

View File

@@ -1,10 +1,6 @@
import urllib.request from fastapi import APIRouter
from fastapi import APIRouter, Request
from sqlalchemy import text from sqlalchemy import text
from app.core.auth import _build_jwks_url, _extract_token, _get_jwks_client
from app.core.config import settings
from app.core.database import async_session from app.core.database import async_session
router = APIRouter(tags=["health"]) router = APIRouter(tags=["health"])
@@ -27,45 +23,3 @@ async def health_check():
async def root(): async def root():
"""Root endpoint.""" """Root endpoint."""
return {"message": "Nuzlocke Tracker API", "docs": "/docs"} return {"message": "Nuzlocke Tracker API", "docs": "/docs"}
@router.get("/auth-debug")
async def auth_debug(request: Request):
"""Temporary diagnostic endpoint for auth debugging."""
result: dict = {}
# Config
result["supabase_url"] = settings.supabase_url
result["has_jwt_secret"] = bool(settings.supabase_jwt_secret)
result["jwks_url"] = (
_build_jwks_url(settings.supabase_url) if settings.supabase_url else None
)
# JWKS fetch
jwks_url = result["jwks_url"]
if jwks_url:
try:
with urllib.request.urlopen(jwks_url, timeout=5) as resp:
result["jwks_status"] = resp.status
result["jwks_body"] = resp.read().decode()
except Exception as e:
result["jwks_fetch_error"] = str(e)
# JWKS client
client = _get_jwks_client()
result["jwks_client_exists"] = client is not None
# Token info (header only, no secrets)
token = _extract_token(request)
if token:
import jwt
try:
header = jwt.get_unverified_header(token)
result["token_header"] = header
except Exception as e:
result["token_header_error"] = str(e)
else:
result["token"] = "not provided"
return result

View File

@@ -1,4 +1,3 @@
import logging
from dataclasses import dataclass from dataclasses import dataclass
from uuid import UUID from uuid import UUID
@@ -13,7 +12,6 @@ from app.core.database import get_session
from app.models.nuzlocke_run import NuzlockeRun from app.models.nuzlocke_run import NuzlockeRun
from app.models.user import User from app.models.user import User
logger = logging.getLogger(__name__)
_jwks_client: PyJWKClient | None = None _jwks_client: PyJWKClient | None = None
@@ -26,21 +24,11 @@ class AuthUser:
role: str | None = None role: str | None = None
def _build_jwks_url(base_url: str) -> str:
"""Build the JWKS URL, adding /auth/v1 prefix for Supabase Cloud."""
base = base_url.rstrip("/")
if "/auth/v1" in base:
return f"{base}/.well-known/jwks.json"
# Supabase Cloud URLs need the /auth/v1 prefix;
# local GoTrue serves JWKS at root but uses HS256 fallback anyway.
return f"{base}/auth/v1/.well-known/jwks.json"
def _get_jwks_client() -> PyJWKClient | None: def _get_jwks_client() -> PyJWKClient | None:
"""Get or create a cached JWKS client.""" """Get or create a cached JWKS client."""
global _jwks_client global _jwks_client
if _jwks_client is None and settings.supabase_url: if _jwks_client is None and settings.supabase_url:
jwks_url = _build_jwks_url(settings.supabase_url) jwks_url = f"{settings.supabase_url.rstrip('/')}/.well-known/jwks.json"
_jwks_client = PyJWKClient(jwks_url, cache_jwk_set=True, lifespan=300) _jwks_client = PyJWKClient(jwks_url, cache_jwk_set=True, lifespan=300)
return _jwks_client return _jwks_client
@@ -72,7 +60,7 @@ def _verify_jwt_hs256(token: str) -> dict | None:
def _verify_jwt(token: str) -> dict | None: def _verify_jwt(token: str) -> dict | None:
"""Verify JWT using JWKS (RS256/ES256), falling back to HS256 shared secret.""" """Verify JWT using JWKS (RS256), falling back to HS256 shared secret."""
client = _get_jwks_client() client = _get_jwks_client()
if client: if client:
try: try:
@@ -80,17 +68,15 @@ def _verify_jwt(token: str) -> dict | None:
return jwt.decode( return jwt.decode(
token, token,
signing_key.key, signing_key.key,
algorithms=["RS256", "ES256"], algorithms=["RS256"],
audience="authenticated", audience="authenticated",
) )
except jwt.InvalidTokenError as e: except jwt.InvalidTokenError:
logger.warning("JWKS JWT validation failed: %s", e) pass
except PyJWKClientError as e: except PyJWKClientError:
logger.warning("JWKS client error: %s", e) pass
except PyJWKSetError as e: except PyJWKSetError:
logger.warning("JWKS set error: %s", e) pass
else:
logger.warning("No JWKS client available (SUPABASE_URL not set?)")
return _verify_jwt_hs256(token) return _verify_jwt_hs256(token)

View File

@@ -14,7 +14,7 @@ class BossResultTeam(Base):
encounter_id: Mapped[int] = mapped_column( encounter_id: Mapped[int] = mapped_column(
ForeignKey("encounters.id", ondelete="CASCADE"), index=True ForeignKey("encounters.id", ondelete="CASCADE"), index=True
) )
level: Mapped[int | None] = mapped_column(SmallInteger, nullable=True) level: Mapped[int] = mapped_column(SmallInteger)
boss_result: Mapped[BossResult] = relationship(back_populates="team") boss_result: Mapped[BossResult] = relationship(back_populates="team")
encounter: Mapped[Encounter] = relationship() encounter: Mapped[Encounter] = relationship()

View File

@@ -57,7 +57,7 @@ class BossBattleResponse(CamelModel):
class BossResultTeamMemberResponse(CamelModel): class BossResultTeamMemberResponse(CamelModel):
id: int id: int
encounter_id: int encounter_id: int
level: int | None level: int
class BossResultResponse(CamelModel): class BossResultResponse(CamelModel):
@@ -120,7 +120,7 @@ class BossPokemonInput(CamelModel):
class BossResultTeamMemberInput(CamelModel): class BossResultTeamMemberInput(CamelModel):
encounter_id: int encounter_id: int
level: int | None = None level: int
class BossResultCreate(CamelModel): class BossResultCreate(CamelModel):

View File

@@ -4,7 +4,7 @@ from uuid import UUID
import jwt import jwt
import pytest import pytest
from cryptography.hazmat.primitives.asymmetric import ec, rsa from cryptography.hazmat.primitives.asymmetric import rsa
from httpx import ASGITransport, AsyncClient from httpx import ASGITransport, AsyncClient
from app.core.auth import AuthUser, get_current_user, require_admin, require_auth from app.core.auth import AuthUser, get_current_user, require_admin, require_auth
@@ -73,55 +73,6 @@ def mock_jwks_client(rsa_key_pair):
return mock_client return mock_client
@pytest.fixture(scope="module")
def ec_key_pair():
"""Generate EC P-256 key pair for testing."""
private_key = ec.generate_private_key(ec.SECP256R1())
public_key = private_key.public_key()
return private_key, public_key
@pytest.fixture
def valid_es256_token(ec_key_pair):
"""Generate a valid ES256 JWT token."""
private_key, _ = ec_key_pair
payload = {
"sub": "user-456",
"email": "ec-user@example.com",
"role": "authenticated",
"aud": "authenticated",
"exp": int(time.time()) + 3600,
}
return jwt.encode(payload, private_key, algorithm="ES256")
@pytest.fixture
def mock_jwks_client_ec(ec_key_pair):
"""Create a mock JWKS client that returns our test EC public key."""
_, public_key = ec_key_pair
mock_client = MagicMock()
mock_signing_key = MagicMock()
mock_signing_key.key = public_key
mock_client.get_signing_key_from_jwt.return_value = mock_signing_key
return mock_client
async def test_get_current_user_valid_es256_token(
valid_es256_token, mock_jwks_client_ec
):
"""Test get_current_user works with ES256 (ECC P-256) tokens."""
with patch("app.core.auth._get_jwks_client", return_value=mock_jwks_client_ec):
class MockRequest:
headers = {"Authorization": f"Bearer {valid_es256_token}"}
user = get_current_user(MockRequest())
assert user is not None
assert user.id == "user-456"
assert user.email == "ec-user@example.com"
assert user.role == "authenticated"
async def test_get_current_user_valid_token(valid_token, mock_jwks_client): async def test_get_current_user_valid_token(valid_token, mock_jwks_client):
"""Test get_current_user returns user for valid token.""" """Test get_current_user returns user for valid token."""
with patch("app.core.auth._get_jwks_client", return_value=mock_jwks_client): with patch("app.core.auth._get_jwks_client", return_value=mock_jwks_client):

View File

@@ -2,9 +2,6 @@ import { supabase } from '../lib/supabase'
const API_BASE = import.meta.env['VITE_API_URL'] ?? '' const API_BASE = import.meta.env['VITE_API_URL'] ?? ''
// Refresh token if it expires within this many seconds
const TOKEN_EXPIRY_BUFFER_SECONDS = 60
export class ApiError extends Error { export class ApiError extends Error {
status: number status: number
@@ -15,40 +12,15 @@ export class ApiError extends Error {
} }
} }
function isTokenExpiringSoon(expiresAt: number): boolean {
const nowSeconds = Math.floor(Date.now() / 1000)
return expiresAt - nowSeconds < TOKEN_EXPIRY_BUFFER_SECONDS
}
async function getValidAccessToken(): Promise<string | null> {
const { data } = await supabase.auth.getSession()
const session = data.session
if (!session) {
return null
}
// If token is expired or expiring soon, refresh it
if (isTokenExpiringSoon(session.expires_at ?? 0)) {
const { data: refreshed, error } = await supabase.auth.refreshSession()
if (error || !refreshed.session) {
return null
}
return refreshed.session.access_token
}
return session.access_token
}
async function getAuthHeaders(): Promise<Record<string, string>> { async function getAuthHeaders(): Promise<Record<string, string>> {
const token = await getValidAccessToken() const { data } = await supabase.auth.getSession()
if (token) { if (data.session?.access_token) {
return { Authorization: `Bearer ${token}` } return { Authorization: `Bearer ${data.session.access_token}` }
} }
return {} return {}
} }
async function request<T>(path: string, options?: RequestInit, isRetry = false): Promise<T> { async function request<T>(path: string, options?: RequestInit): Promise<T> {
const authHeaders = await getAuthHeaders() const authHeaders = await getAuthHeaders()
const res = await fetch(`${API_BASE}/api/v1${path}`, { const res = await fetch(`${API_BASE}/api/v1${path}`, {
...options, ...options,
@@ -59,14 +31,6 @@ async function request<T>(path: string, options?: RequestInit, isRetry = false):
}, },
}) })
// On 401, try refreshing the token and retry once
if (res.status === 401 && !isRetry) {
const { data: refreshed, error } = await supabase.auth.refreshSession()
if (!error && refreshed.session) {
return request<T>(path, options, true)
}
}
if (!res.ok) { if (!res.ok) {
const body = await res.json().catch(() => ({})) const body = await res.json().catch(() => ({}))
throw new ApiError(res.status, body.detail ?? res.statusText) throw new ApiError(res.status, body.detail ?? res.statusText)

View File

@@ -23,7 +23,10 @@ function matchVariant(labels: string[], starterName?: string | null): string | n
return matches.length === 1 ? (matches[0] ?? null) : null return matches.length === 1 ? (matches[0] ?? null) : null
} }
type TeamSelection = number interface TeamSelection {
encounterId: number
level: number
}
export function BossDefeatModal({ export function BossDefeatModal({
boss, boss,
@@ -33,15 +36,26 @@ export function BossDefeatModal({
isPending, isPending,
starterName, starterName,
}: BossDefeatModalProps) { }: BossDefeatModalProps) {
const [selectedTeam, setSelectedTeam] = useState<Set<TeamSelection>>(new Set()) const [selectedTeam, setSelectedTeam] = useState<Map<number, TeamSelection>>(new Map())
const toggleTeamMember = (encounterId: number) => { const toggleTeamMember = (enc: EncounterDetail) => {
setSelectedTeam((prev) => { setSelectedTeam((prev) => {
const next = new Set(prev) const next = new Map(prev)
if (next.has(encounterId)) { if (next.has(enc.id)) {
next.delete(encounterId) next.delete(enc.id)
} else { } else {
next.add(encounterId) next.set(enc.id, { encounterId: enc.id, level: enc.catchLevel ?? 1 })
}
return next
})
}
const updateLevel = (encounterId: number, level: number) => {
setSelectedTeam((prev) => {
const next = new Map(prev)
const existing = next.get(encounterId)
if (existing) {
next.set(encounterId, { ...existing, level })
} }
return next return next
}) })
@@ -73,9 +87,7 @@ export function BossDefeatModal({
const handleSubmit = (e: FormEvent) => { const handleSubmit = (e: FormEvent) => {
e.preventDefault() e.preventDefault()
const team: BossResultTeamMemberInput[] = Array.from(selectedTeam).map((encounterId) => ({ const team: BossResultTeamMemberInput[] = Array.from(selectedTeam.values())
encounterId,
}))
onSubmit({ onSubmit({
bossBattleId: boss.id, bossBattleId: boss.id,
result: 'won', result: 'won',
@@ -122,17 +134,11 @@ export function BossDefeatModal({
return ( return (
<div key={bp.id} className="flex flex-col items-center"> <div key={bp.id} className="flex flex-col items-center">
{bp.pokemon.spriteUrl ? ( {bp.pokemon.spriteUrl ? (
<img <img src={bp.pokemon.spriteUrl} alt={bp.pokemon.name} className="w-10 h-10" />
src={bp.pokemon.spriteUrl}
alt={bp.pokemon.name}
className="w-10 h-10"
/>
) : ( ) : (
<div className="w-10 h-10 bg-surface-3 rounded-full" /> <div className="w-10 h-10 bg-surface-3 rounded-full" />
)} )}
<span className="text-xs text-text-tertiary capitalize"> <span className="text-xs text-text-tertiary capitalize">{bp.pokemon.name}</span>
{bp.pokemon.name}
</span>
<span className="text-xs font-medium text-text-secondary">Lv.{bp.level}</span> <span className="text-xs font-medium text-text-secondary">Lv.{bp.level}</span>
<ConditionBadge condition={bp.conditionLabel} size="xs" /> <ConditionBadge condition={bp.conditionLabel} size="xs" />
{bp.ability && ( {bp.ability && (
@@ -160,6 +166,7 @@ export function BossDefeatModal({
<div className="grid grid-cols-2 sm:grid-cols-3 gap-2 max-h-48 overflow-y-auto"> <div className="grid grid-cols-2 sm:grid-cols-3 gap-2 max-h-48 overflow-y-auto">
{aliveEncounters.map((enc) => { {aliveEncounters.map((enc) => {
const isSelected = selectedTeam.has(enc.id) const isSelected = selectedTeam.has(enc.id)
const selection = selectedTeam.get(enc.id)
const displayPokemon = enc.currentPokemon ?? enc.pokemon const displayPokemon = enc.currentPokemon ?? enc.pokemon
return ( return (
<div <div
@@ -169,12 +176,12 @@ export function BossDefeatModal({
? 'border-accent-500 bg-accent-500/10' ? 'border-accent-500 bg-accent-500/10'
: 'border-border-default hover:bg-surface-2' : 'border-border-default hover:bg-surface-2'
}`} }`}
onClick={() => toggleTeamMember(enc.id)} onClick={() => toggleTeamMember(enc)}
> >
<input <input
type="checkbox" type="checkbox"
checked={isSelected} checked={isSelected}
onChange={() => toggleTeamMember(enc.id)} onChange={() => toggleTeamMember(enc)}
className="sr-only" className="sr-only"
/> />
{displayPokemon.spriteUrl ? ( {displayPokemon.spriteUrl ? (
@@ -186,9 +193,26 @@ export function BossDefeatModal({
) : ( ) : (
<div className="w-8 h-8 bg-surface-3 rounded-full" /> <div className="w-8 h-8 bg-surface-3 rounded-full" />
)} )}
<p className="flex-1 min-w-0 text-xs font-medium truncate"> <div className="flex-1 min-w-0">
<p className="text-xs font-medium truncate">
{enc.nickname ?? displayPokemon.name} {enc.nickname ?? displayPokemon.name}
</p> </p>
{isSelected && (
<input
type="number"
min={1}
max={100}
value={selection?.level ?? enc.catchLevel ?? 1}
onChange={(e) => {
e.stopPropagation()
updateLevel(enc.id, Number.parseInt(e.target.value, 10) || 1)
}}
onClick={(e) => e.stopPropagation()}
className="w-14 text-xs px-1 py-0.5 mt-1 rounded border border-border-default bg-surface-1"
placeholder="Lv"
/>
)}
</div>
</div> </div>
) )
})} })}

View File

@@ -7,7 +7,10 @@ const isLocalDev = supabaseUrl.includes('localhost')
// supabase-js hardcodes /auth/v1 as the auth path prefix, but GoTrue // supabase-js hardcodes /auth/v1 as the auth path prefix, but GoTrue
// serves at the root when accessed directly (no API gateway). // serves at the root when accessed directly (no API gateway).
// This custom fetch strips the prefix for local dev. // This custom fetch strips the prefix for local dev.
function localGoTrueFetch(input: RequestInfo | URL, init?: RequestInit): Promise<Response> { function localGoTrueFetch(
input: RequestInfo | URL,
init?: RequestInit,
): Promise<Response> {
const url = input instanceof Request ? input.url : String(input) const url = input instanceof Request ? input.url : String(input)
const rewritten = url.replace('/auth/v1/', '/') const rewritten = url.replace('/auth/v1/', '/')
if (input instanceof Request) { if (input instanceof Request) {
@@ -21,10 +24,6 @@ function createSupabaseClient(): SupabaseClient {
return createClient('http://localhost:9999', 'stub-key') return createClient('http://localhost:9999', 'stub-key')
} }
return createClient(supabaseUrl, supabaseAnonKey, { return createClient(supabaseUrl, supabaseAnonKey, {
auth: {
autoRefreshToken: true,
persistSession: true,
},
...(isLocalDev && { ...(isLocalDev && {
global: { fetch: localGoTrueFetch }, global: { fetch: localGoTrueFetch },
}), }),

View File

@@ -922,7 +922,7 @@ export function RunEncounters() {
}) })
return ( return (
<div className="max-w-4xl lg:max-w-6xl mx-auto p-8"> <div className="max-w-4xl mx-auto p-8">
{/* Header */} {/* Header */}
<div className="mb-6"> <div className="mb-6">
<Link <Link
@@ -1246,12 +1246,9 @@ export function RunEncounters() {
{/* Encounters Tab */} {/* Encounters Tab */}
{activeTab === 'encounters' && ( {activeTab === 'encounters' && (
<> <>
<div className="lg:flex lg:gap-6"> {/* Team Section */}
{/* Main content column */}
<div className="flex-1 min-w-0">
{/* Team Section - Mobile/Tablet only */}
{(alive.length > 0 || dead.length > 0) && ( {(alive.length > 0 || dead.length > 0) && (
<div className="mb-6 lg:hidden"> <div className="mb-6">
<div className="flex items-center justify-between mb-3"> <div className="flex items-center justify-between mb-3">
<button <button
type="button" type="button"
@@ -1301,9 +1298,7 @@ export function RunEncounters() {
key={enc.id} key={enc.id}
encounter={enc} encounter={enc}
onClick={ onClick={
isActive && canEdit isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
? () => setSelectedTeamEncounter(enc)
: undefined
} }
/> />
))} ))}
@@ -1319,9 +1314,7 @@ export function RunEncounters() {
encounter={enc} encounter={enc}
showFaintLevel showFaintLevel
onClick={ onClick={
isActive && canEdit isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
? () => setSelectedTeamEncounter(enc)
: undefined
} }
/> />
))} ))}
@@ -1354,9 +1347,7 @@ export function RunEncounters() {
<PokemonCard <PokemonCard
key={enc.id} key={enc.id}
encounter={enc} encounter={enc}
onClick={ onClick={isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined}
isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
}
/> />
))} ))}
</div> </div>
@@ -1481,9 +1472,7 @@ export function RunEncounters() {
> >
<span className={`w-2.5 h-2.5 rounded-full shrink-0 ${si.dot}`} /> <span className={`w-2.5 h-2.5 rounded-full shrink-0 ${si.dot}`} />
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0">
<div className="text-sm font-medium text-text-primary"> <div className="text-sm font-medium text-text-primary">{route.name}</div>
{route.name}
</div>
{encounter ? ( {encounter ? (
<div className="flex items-center gap-2 mt-0.5"> <div className="flex items-center gap-2 mt-0.5">
{encounter.pokemon.spriteUrl && ( {encounter.pokemon.spriteUrl && (
@@ -1497,9 +1486,7 @@ export function RunEncounters() {
{encounter.nickname ?? encounter.pokemon.name} {encounter.nickname ?? encounter.pokemon.name}
{encounter.status === 'caught' && {encounter.status === 'caught' &&
encounter.faintLevel !== null && encounter.faintLevel !== null &&
(encounter.deathCause (encounter.deathCause ? `${encounter.deathCause}` : ' (dead)')}
? `${encounter.deathCause}`
: ' (dead)')}
</span> </span>
{giftEncounter && ( {giftEncounter && (
<> <>
@@ -1611,11 +1598,7 @@ export function RunEncounters() {
/> />
</svg> </svg>
{boss.spriteUrl && ( {boss.spriteUrl && (
<img <img src={boss.spriteUrl} alt={boss.name} className="h-10 w-auto" />
src={boss.spriteUrl}
alt={boss.name}
className="h-10 w-auto"
/>
)} )}
<div> <div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
@@ -1625,9 +1608,7 @@ export function RunEncounters() {
<span className="px-2 py-0.5 text-xs font-medium rounded-full bg-surface-2 text-text-secondary"> <span className="px-2 py-0.5 text-xs font-medium rounded-full bg-surface-2 text-text-secondary">
{bossTypeLabel[boss.bossType] ?? boss.bossType} {bossTypeLabel[boss.bossType] ?? boss.bossType}
</span> </span>
{boss.specialtyType && ( {boss.specialtyType && <TypeBadge type={boss.specialtyType} />}
<TypeBadge type={boss.specialtyType} />
)}
</div> </div>
<p className="text-xs text-text-tertiary"> <p className="text-xs text-text-tertiary">
{boss.location} &middot; Level Cap: {boss.levelCap} {boss.location} &middot; Level Cap: {boss.levelCap}
@@ -1682,11 +1663,9 @@ export function RunEncounters() {
<span className="text-[10px] text-text-tertiary capitalize"> <span className="text-[10px] text-text-tertiary capitalize">
{enc.nickname ?? dp.name} {enc.nickname ?? dp.name}
</span> </span>
{tm.level != null && (
<span className="text-[10px] text-text-muted"> <span className="text-[10px] text-text-muted">
Lv.{tm.level} Lv.{tm.level}
</span> </span>
)}
</div> </div>
) )
})} })}
@@ -1711,70 +1690,6 @@ export function RunEncounters() {
) )
})} })}
</div> </div>
</div>
{/* Team Sidebar - Desktop only */}
{(alive.length > 0 || dead.length > 0) && (
<div className="hidden lg:block w-64 shrink-0">
<div className="sticky top-20 max-h-[calc(100vh-6rem)] overflow-y-auto">
<div className="bg-surface-1 border border-border-default rounded-lg p-4">
<div className="flex items-center justify-between mb-3">
<h2 className="text-lg font-semibold text-text-primary">
{isActive ? 'Team' : 'Final Team'}
</h2>
<span className="text-xs text-text-muted">
{alive.length}/{alive.length + dead.length}
</span>
</div>
{alive.length > 1 && (
<select
value={teamSort}
onChange={(e) => setTeamSort(e.target.value as TeamSortKey)}
className="w-full text-sm border border-border-default rounded-lg px-3 py-1.5 bg-surface-0 text-text-primary mb-3"
>
<option value="route">Route Order</option>
<option value="level">Catch Level</option>
<option value="species">Species Name</option>
<option value="dex">National Dex</option>
</select>
)}
{alive.length > 0 && (
<div className="grid grid-cols-2 gap-2 mb-3">
{alive.map((enc) => (
<PokemonCard
key={enc.id}
encounter={enc}
onClick={
isActive && canEdit ? () => setSelectedTeamEncounter(enc) : undefined
}
/>
))}
</div>
)}
{dead.length > 0 && (
<>
<h3 className="text-sm font-medium text-text-tertiary mb-2">Graveyard</h3>
<div className="grid grid-cols-2 gap-2">
{dead.map((enc) => (
<PokemonCard
key={enc.id}
encounter={enc}
showFaintLevel
onClick={
isActive && canEdit
? () => setSelectedTeamEncounter(enc)
: undefined
}
/>
))}
</div>
</>
)}
</div>
</div>
</div>
)}
</div>
{/* Encounter Modal */} {/* Encounter Modal */}
{selectedRoute && ( {selectedRoute && (

View File

@@ -238,7 +238,7 @@ export interface BossBattle {
export interface BossResultTeamMember { export interface BossResultTeamMember {
id: number id: number
encounterId: number encounterId: number
level: number | null level: number
} }
export interface BossResult { export interface BossResult {
@@ -253,7 +253,7 @@ export interface BossResult {
export interface BossResultTeamMemberInput { export interface BossResultTeamMemberInput {
encounterId: number encounterId: number
level?: number | null level: number
} }
export interface CreateBossResultInput { export interface CreateBossResultInput {