Private
Public Access
ksmithandClaude Sonnet 5
bd3e621e9f
Replaces the single custom_theme_colors blob (one palette per user) with a proper CustomTheme table -- users can now save, name, and switch between as many custom palettes as they like, not just one. Data model: users.active_custom_theme_id references whichever saved CustomTheme (if any) is currently active; theme='custom' + that id together determine what's rendered. The migration data-migrates any already-saved single palette into a named CustomTheme row on upgrade, and best-effort backfills the active one back into the old column shape on downgrade. New endpoints under /api/custom-themes: list, create, rename/recolor, delete (falls back the user to a preset if the deleted theme was active, so the two theme columns can never disagree), and activate. UserRead.active_custom_theme is only populated when theme == 'custom' even though the DB deliberately keeps the id set while a preset is active, so switching to a preset and back doesn't lose the saved palette. ProfileModal now lists saved themes as swatches (click to activate, pencil to edit -- active or not, trash to delete with a confirm), plus a "+ New" button that creates, activates, and opens the editor for a fresh theme immediately. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
54 lines
1.4 KiB
Python
54 lines
1.4 KiB
Python
from sqlalchemy import or_, select
|
|
from sqlalchemy.exc import IntegrityError
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from app.models import User
|
|
from app.schemas.user import UserCreate
|
|
from app.security import hash_password, verify_password
|
|
|
|
|
|
class DuplicateUserError(Exception):
|
|
pass
|
|
|
|
|
|
class InvalidCredentialsError(Exception):
|
|
pass
|
|
|
|
|
|
class AccountDeactivatedError(Exception):
|
|
pass
|
|
|
|
|
|
async def register_user(db: AsyncSession, data: UserCreate) -> User:
|
|
user = User(
|
|
username=data.username,
|
|
email=data.email,
|
|
password_hash=hash_password(data.password),
|
|
)
|
|
db.add(user)
|
|
try:
|
|
await db.commit()
|
|
except IntegrityError as exc:
|
|
await db.rollback()
|
|
raise DuplicateUserError() from exc
|
|
|
|
await db.refresh(user)
|
|
return user
|
|
|
|
|
|
async def authenticate_user(
|
|
db: AsyncSession, username_or_email: str, password: str
|
|
) -> User:
|
|
result = await db.execute(
|
|
select(User)
|
|
.where(or_(User.username == username_or_email, User.email == username_or_email))
|
|
.options(selectinload(User.active_custom_theme))
|
|
)
|
|
user = result.scalar_one_or_none()
|
|
if user is None or not verify_password(password, user.password_hash):
|
|
raise InvalidCredentialsError()
|
|
if not user.is_active:
|
|
raise AccountDeactivatedError()
|
|
return user
|