Scarriffle
128f1b468a
- Neues Profil-Modal: Avatar-Upload, E-Mail bearbeiten, Kalender-Übersicht - Passwort ändern mit Validierung des aktuellen Passworts - TOTP 2FA: QR-Code + manueller Schlüssel, Aktivierung/Deaktivierung - Login-Flow unterstützt 2FA-Code (neuer JSON-Endpoint /auth/login) - User-Dropdown mit Profil-Link statt confirm()-Dialog - Kalenderfarben in Sidebar editierbar (Color-Picker auf Farbpunkt) - Monatsansicht nutzt volle Höhe (#view-container flex fix) - requirements.txt: passlib durch bcrypt ersetzt, pyotp/qrcode/Pillow hinzugefügt
114 lines
3.6 KiB
Python
114 lines
3.6 KiB
Python
from typing import Optional
|
|
|
|
import pyotp
|
|
from fastapi import APIRouter, Depends, HTTPException, status
|
|
from fastapi.security import OAuth2PasswordRequestForm
|
|
from pydantic import BaseModel
|
|
from sqlalchemy.orm import Session
|
|
|
|
import models
|
|
from auth import create_access_token, get_current_user, get_password_hash, verify_password
|
|
from database import get_db
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
class SetupRequest(BaseModel):
|
|
username: str
|
|
password: str
|
|
email: Optional[str] = None
|
|
|
|
|
|
class LoginRequest(BaseModel):
|
|
username: str
|
|
password: str
|
|
totp_code: Optional[str] = None
|
|
|
|
|
|
def _user_dict(user: models.User) -> dict:
|
|
return {"id": user.id, "username": user.username, "is_admin": user.is_admin}
|
|
|
|
|
|
@router.get("/setup-required")
|
|
def setup_required(db: Session = Depends(get_db)):
|
|
return {"required": db.query(models.User).count() == 0}
|
|
|
|
|
|
@router.post("/setup")
|
|
def setup(req: SetupRequest, db: Session = Depends(get_db)):
|
|
if db.query(models.User).count() > 0:
|
|
raise HTTPException(400, "Setup already completed")
|
|
user = models.User(
|
|
username=req.username,
|
|
email=req.email,
|
|
password_hash=get_password_hash(req.password),
|
|
is_admin=True,
|
|
)
|
|
db.add(user)
|
|
db.flush()
|
|
db.add(models.UserSettings(user_id=user.id))
|
|
db.commit()
|
|
db.refresh(user)
|
|
token = create_access_token({"sub": user.username})
|
|
return {"access_token": token, "token_type": "bearer", "user": _user_dict(user)}
|
|
|
|
|
|
@router.post("/token")
|
|
def login(
|
|
form_data: OAuth2PasswordRequestForm = Depends(), db: Session = Depends(get_db)
|
|
):
|
|
user = (
|
|
db.query(models.User).filter(models.User.username == form_data.username).first()
|
|
)
|
|
if not user or not verify_password(form_data.password, user.password_hash):
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Incorrect username or password",
|
|
headers={"WWW-Authenticate": "Bearer"},
|
|
)
|
|
if user.totp_enabled:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="2fa_required",
|
|
)
|
|
token = create_access_token({"sub": user.username})
|
|
return {"access_token": token, "token_type": "bearer", "user": _user_dict(user)}
|
|
|
|
|
|
@router.post("/login")
|
|
def login_json(req: LoginRequest, db: Session = Depends(get_db)):
|
|
user = (
|
|
db.query(models.User).filter(models.User.username == req.username).first()
|
|
)
|
|
if not user or not verify_password(req.password, user.password_hash):
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Benutzername oder Passwort falsch",
|
|
)
|
|
if user.totp_enabled:
|
|
if not req.totp_code:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="2fa_required",
|
|
)
|
|
totp = pyotp.TOTP(user.totp_secret)
|
|
if not totp.verify(req.totp_code, valid_window=1):
|
|
raise HTTPException(
|
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
|
detail="Ungültiger 2FA-Code",
|
|
)
|
|
token = create_access_token({"sub": user.username})
|
|
return {"access_token": token, "token_type": "bearer", "user": _user_dict(user)}
|
|
|
|
|
|
@router.get("/me")
|
|
def me(current_user: models.User = Depends(get_current_user)):
|
|
return {
|
|
"id": current_user.id,
|
|
"username": current_user.username,
|
|
"email": current_user.email,
|
|
"is_admin": current_user.is_admin,
|
|
"has_avatar": current_user.avatar_filename is not None,
|
|
"totp_enabled": current_user.totp_enabled,
|
|
}
|