Private
Public Access
ksmithandClaude Sonnet 5
1a05cf5515
Every email went through one shared plain-text-only path. Redesigned send_email/send_test_email around structured paragraphs + an optional CTA button instead of one pre-formatted string, and render both a proper styled HTML card (table-based, inline styles -- email clients strip <style> blocks and don't support CSS variables) and a clean plain-text fallback from the same input, sent as multipart/alternative. The HTML is themed per recipient: an email to an existing user renders in their own selected theme (dark/light/midnight/sunset, or their saved custom palette), resolved server-side from User.theme/ active_custom_theme_id. Site invites have no account yet to read a theme from, so they use the default DarkSingularity palette. All five existing email triggers (site invite, room-added, password reset, #66's DM notification, admin test email) updated to the new call shape. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
85 lines
2.6 KiB
Python
85 lines
2.6 KiB
Python
import secrets
|
|
from datetime import datetime, timezone
|
|
|
|
from sqlalchemy import select
|
|
from sqlalchemy.ext.asyncio import AsyncSession
|
|
from sqlalchemy.orm import selectinload
|
|
|
|
from app.models import PasswordReset, User
|
|
from app.security import hash_password, hash_token, verify_password
|
|
from app.services.email_service import send_email
|
|
|
|
|
|
class InvalidCurrentPasswordError(Exception):
|
|
pass
|
|
|
|
|
|
class PasswordResetInvalidError(Exception):
|
|
pass
|
|
|
|
|
|
async def change_password(
|
|
db: AsyncSession, user: User, current_password: str, new_password: str
|
|
) -> None:
|
|
if not verify_password(current_password, user.password_hash):
|
|
raise InvalidCurrentPasswordError()
|
|
user.password_hash = hash_password(new_password)
|
|
await db.commit()
|
|
|
|
|
|
async def request_password_reset(db: AsyncSession, email: str, base_url: str) -> None:
|
|
# Always returns normally, whether or not the email matched an account --
|
|
# the router never reveals which, to avoid leaking registered emails.
|
|
result = await db.execute(
|
|
select(User).where(User.email == email, User.is_active.is_(True))
|
|
)
|
|
user = result.scalar_one_or_none()
|
|
if user is None:
|
|
return
|
|
|
|
raw_token = secrets.token_urlsafe(32)
|
|
db.add(PasswordReset(user_id=user.id, token_hash=hash_token(raw_token)))
|
|
await db.commit()
|
|
|
|
reset_link = f"{base_url.rstrip('/')}/reset-password?token={raw_token}"
|
|
await send_email(
|
|
db,
|
|
email,
|
|
"Reset your DS Chat password",
|
|
[
|
|
"Someone requested a password reset for this account.",
|
|
"This link expires in 15 minutes. If you didn't request this, you can ignore this email.",
|
|
],
|
|
cta_label="Reset password",
|
|
cta_url=reset_link,
|
|
theme_user=user,
|
|
)
|
|
|
|
|
|
async def _get_valid_reset(db: AsyncSession, token: str) -> PasswordReset:
|
|
result = await db.execute(
|
|
select(PasswordReset).where(PasswordReset.token_hash == hash_token(token))
|
|
)
|
|
reset = result.scalar_one_or_none()
|
|
if reset is None or reset.used:
|
|
raise PasswordResetInvalidError()
|
|
if reset.expires_at <= datetime.now(timezone.utc):
|
|
raise PasswordResetInvalidError()
|
|
return reset
|
|
|
|
|
|
async def validate_reset_token(db: AsyncSession, token: str) -> None:
|
|
await _get_valid_reset(db, token)
|
|
|
|
|
|
async def complete_password_reset(db: AsyncSession, token: str, new_password: str) -> User:
|
|
reset = await _get_valid_reset(db, token)
|
|
user = await db.get(
|
|
User, reset.user_id, options=[selectinload(User.active_custom_theme)]
|
|
)
|
|
user.password_hash = hash_password(new_password)
|
|
reset.used = True
|
|
await db.commit()
|
|
await db.refresh(user)
|
|
return user
|