Add email invitation system with SMTP configuration and invite token workflow
Implemented comprehensive email invitation functionality for new users. Added SMTP settings management in admin panel with configuration UI for host, port, credentials, sender details, and TLS options. Created invite token system with 48-hour expiration and single-use enforcement. Added mailer module with HTML email templates in German theme styling (radial gradient backgrounds, gold accents, bordered cards). Implemented invite
This commit is contained in:
+111
-6
@@ -1,7 +1,12 @@
|
||||
import hashlib
|
||||
import secrets
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Request
|
||||
from sqlalchemy.orm import Session
|
||||
from ..db import get_db
|
||||
from ..models import User, Role
|
||||
from ..mailer import send_html_email, send_user_invite
|
||||
from ..models import AppSettings, InviteToken, User, Role
|
||||
from ..security import hash_password, get_session_user_id
|
||||
|
||||
router = APIRouter(prefix="/admin", tags=["admin"])
|
||||
@@ -37,18 +42,47 @@ def create_user(req: Request, data: dict, db: Session = Depends(get_db)):
|
||||
password = data.get("password") or ""
|
||||
display_name = (data.get("display_name") or "").strip()
|
||||
|
||||
if not email or not password:
|
||||
raise HTTPException(400, "email/password required")
|
||||
if not email or not display_name:
|
||||
raise HTTPException(400, "name/email required")
|
||||
if db.query(User).filter(User.email == email).first():
|
||||
raise HTTPException(409, "email exists")
|
||||
|
||||
role = data.get("role") or Role.user.value
|
||||
role = data.get("role")
|
||||
if not role:
|
||||
raise HTTPException(400, "role required")
|
||||
if role not in (Role.admin.value, Role.user.value):
|
||||
raise HTTPException(400, "invalid role")
|
||||
|
||||
settings = db.query(AppSettings).filter(AppSettings.id == "default").first() or AppSettings(id="default")
|
||||
invite_sent = not password
|
||||
raw_token = None
|
||||
|
||||
if invite_sent:
|
||||
if not settings.smtp_host or not settings.smtp_from_email:
|
||||
raise HTTPException(400, "configure SMTP settings before sending invites")
|
||||
raw_token = secrets.token_urlsafe(32)
|
||||
password = secrets.token_urlsafe(32)
|
||||
|
||||
u = User(email=email, password_hash=hash_password(password), role=role, display_name=display_name)
|
||||
db.add(u); db.commit()
|
||||
return {"ok": True, "id": u.id}
|
||||
db.add(u)
|
||||
db.flush()
|
||||
|
||||
if invite_sent:
|
||||
invite = InviteToken(
|
||||
user_id=u.id,
|
||||
token_hash=hashlib.sha256(raw_token.encode()).hexdigest(),
|
||||
expires_at=datetime.now(timezone.utc) + timedelta(hours=48),
|
||||
)
|
||||
db.add(invite)
|
||||
invite_url = f"{(settings.app_base_url or 'http://localhost:8081').rstrip('/')}/invite/{raw_token}"
|
||||
try:
|
||||
send_user_invite(settings, u, invite_url)
|
||||
except Exception as exc:
|
||||
db.rollback()
|
||||
raise HTTPException(502, f"invite email could not be sent: {exc}")
|
||||
|
||||
db.commit()
|
||||
return {"ok": True, "id": u.id, "invite_sent": invite_sent}
|
||||
|
||||
@router.delete("/users/{user_id}")
|
||||
def delete_user(req: Request, user_id: str, db: Session = Depends(get_db)):
|
||||
@@ -106,3 +140,74 @@ def update_user(req: Request, user_id: str, data: dict, db: Session = Depends(ge
|
||||
db.add(user)
|
||||
db.commit()
|
||||
return {"ok": True}
|
||||
|
||||
|
||||
def get_settings(db: Session) -> AppSettings:
|
||||
settings = db.query(AppSettings).filter(AppSettings.id == "default").first()
|
||||
if not settings:
|
||||
settings = AppSettings(id="default")
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
db.refresh(settings)
|
||||
return settings
|
||||
|
||||
|
||||
@router.get("/settings/smtp")
|
||||
def read_smtp_settings(req: Request, db: Session = Depends(get_db)):
|
||||
require_admin(req, db)
|
||||
settings = get_settings(db)
|
||||
return {
|
||||
"smtp_host": settings.smtp_host,
|
||||
"smtp_port": settings.smtp_port,
|
||||
"smtp_username": settings.smtp_username,
|
||||
"smtp_password_configured": bool(settings.smtp_password),
|
||||
"smtp_from_email": settings.smtp_from_email,
|
||||
"smtp_from_name": settings.smtp_from_name,
|
||||
"smtp_use_tls": settings.smtp_use_tls,
|
||||
"app_base_url": settings.app_base_url,
|
||||
}
|
||||
|
||||
|
||||
@router.patch("/settings/smtp")
|
||||
def update_smtp_settings(req: Request, data: dict, db: Session = Depends(get_db)):
|
||||
require_admin(req, db)
|
||||
settings = get_settings(db)
|
||||
|
||||
settings.smtp_host = (data.get("smtp_host") or "").strip()
|
||||
try:
|
||||
settings.smtp_port = int(data.get("smtp_port") or 587)
|
||||
except (TypeError, ValueError):
|
||||
raise HTTPException(400, "SMTP port must be a number")
|
||||
settings.smtp_username = (data.get("smtp_username") or "").strip()
|
||||
settings.smtp_from_email = (data.get("smtp_from_email") or "").strip()
|
||||
settings.smtp_from_name = (data.get("smtp_from_name") or "Cluedo HP").strip()
|
||||
settings.smtp_use_tls = bool(data.get("smtp_use_tls", True))
|
||||
settings.app_base_url = (data.get("app_base_url") or "http://localhost:8081").strip().rstrip("/")
|
||||
if "smtp_password" in data and data.get("smtp_password"):
|
||||
settings.smtp_password = data["smtp_password"]
|
||||
|
||||
if settings.smtp_host and not settings.smtp_from_email:
|
||||
raise HTTPException(400, "from email required when SMTP is configured")
|
||||
db.add(settings)
|
||||
db.commit()
|
||||
return {"ok": True}
|
||||
|
||||
|
||||
@router.post("/settings/smtp/test")
|
||||
def test_smtp_settings(req: Request, data: dict, db: Session = Depends(get_db)):
|
||||
require_admin(req, db)
|
||||
settings = get_settings(db)
|
||||
recipient = (data.get("recipient") or "").strip()
|
||||
if not recipient:
|
||||
raise HTTPException(400, "recipient required")
|
||||
try:
|
||||
send_html_email(
|
||||
settings,
|
||||
recipient,
|
||||
"SMTP-Test – Cluedo HP",
|
||||
"<div style='font-family:Georgia,serif;padding:24px;background:#17161b;color:#f5efdc'><h2 style='color:#e9d8a6'>SMTP funktioniert</h2><p>Der Einladungsversand ist bereit.</p></div>",
|
||||
"SMTP funktioniert. Der Einladungsversand ist bereit.",
|
||||
)
|
||||
except Exception as exc:
|
||||
raise HTTPException(502, f"SMTP test failed: {exc}")
|
||||
return {"ok": True}
|
||||
|
||||
Reference in New Issue
Block a user