79fdf4f54a
- Backend: co-member group_visible calendars now surface in /local/calendars
(owned=false, shared_by=owner, read-only, group_shared) and in the normal
/caldav/events merge (via readable_local_calendar_ids), deduped against
direct shares / group calendars so nothing appears twice.
- Backend: new User.directory_hidden — a user can hide from sharing/group
pickers (/users/directory), while admin user management (/users/) still lists
them. Migration + profile GET/PUT.
- Backend: /groups/{id} members carry shares_calendar so clients can drop
phantom rows for members who share nothing.
- Frontend: reachable "Teilen" button on owned local calendars; share modal is
now a checkbox multi-select of users (checked = shared). Hidden-profile toggle
in Settings → Profile. Group member filter only lists members who actually
share (phantom fix). Calendars shared with me moved to a dedicated read-only
"shared with me" section in the manage table.
- Tests: group_visible propagation, no-share absence, dedup, directory_hidden.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
120 lines
3.3 KiB
Python
120 lines
3.3 KiB
Python
from typing import Optional
|
|
|
|
from fastapi import APIRouter, Depends, HTTPException
|
|
from pydantic import BaseModel
|
|
from sqlalchemy import func
|
|
from sqlalchemy.orm import Session
|
|
|
|
import models
|
|
from auth import get_current_admin, get_current_user, get_password_hash
|
|
from database import get_db
|
|
|
|
router = APIRouter()
|
|
|
|
|
|
class CreateUserRequest(BaseModel):
|
|
username: str
|
|
password: str
|
|
email: Optional[str] = None
|
|
is_admin: bool = False
|
|
|
|
|
|
class ChangePasswordRequest(BaseModel):
|
|
password: str
|
|
|
|
|
|
def _user_dict(u: models.User) -> dict:
|
|
return {
|
|
"id": u.id,
|
|
"username": u.username,
|
|
"display_name": u.display_name or u.username,
|
|
"email": u.email,
|
|
"is_admin": u.is_admin,
|
|
}
|
|
|
|
|
|
@router.get("/")
|
|
def list_users(
|
|
db: Session = Depends(get_db),
|
|
_: models.User = Depends(get_current_admin),
|
|
):
|
|
return [_user_dict(u) for u in db.query(models.User).all()]
|
|
|
|
|
|
@router.get("/directory")
|
|
def user_directory(
|
|
db: Session = Depends(get_db),
|
|
current_user: models.User = Depends(get_current_user),
|
|
):
|
|
"""Lightweight list of all users (id + display_name) for sharing/group pickers.
|
|
|
|
Available to any authenticated user (unlike GET / which is admin-only).
|
|
Excludes the requesting user.
|
|
"""
|
|
users = (
|
|
db.query(models.User)
|
|
.filter(
|
|
models.User.id != current_user.id,
|
|
models.User.directory_hidden == False, # noqa: E712 — hidden users opt out of pickers
|
|
)
|
|
.order_by(models.User.username)
|
|
.all()
|
|
)
|
|
return [{"id": u.id, "display_name": u.display_name or u.username} for u in users]
|
|
|
|
|
|
@router.post("/")
|
|
def create_user(
|
|
req: CreateUserRequest,
|
|
db: Session = Depends(get_db),
|
|
_: models.User = Depends(get_current_admin),
|
|
):
|
|
if db.query(models.User).filter(func.lower(models.User.username) == req.username.lower()).first():
|
|
raise HTTPException(400, "Username already taken")
|
|
user = models.User(
|
|
username=req.username.lower(),
|
|
display_name=req.username.strip(), # keep the original casing for display
|
|
email=req.email,
|
|
password_hash=get_password_hash(req.password),
|
|
is_admin=req.is_admin,
|
|
)
|
|
db.add(user)
|
|
db.flush()
|
|
db.add(models.UserSettings(user_id=user.id))
|
|
db.commit()
|
|
db.refresh(user)
|
|
return _user_dict(user)
|
|
|
|
|
|
@router.delete("/{user_id}")
|
|
def delete_user(
|
|
user_id: int,
|
|
db: Session = Depends(get_db),
|
|
current_user: models.User = Depends(get_current_admin),
|
|
):
|
|
if user_id == current_user.id:
|
|
raise HTTPException(400, "Cannot delete yourself")
|
|
user = db.query(models.User).filter(models.User.id == user_id).first()
|
|
if not user:
|
|
raise HTTPException(404, "User not found")
|
|
db.delete(user)
|
|
db.commit()
|
|
return {"ok": True}
|
|
|
|
|
|
@router.put("/{user_id}/password")
|
|
def change_password(
|
|
user_id: int,
|
|
req: ChangePasswordRequest,
|
|
db: Session = Depends(get_db),
|
|
current_user: models.User = Depends(get_current_user),
|
|
):
|
|
if not current_user.is_admin and current_user.id != user_id:
|
|
raise HTTPException(403, "Not authorized")
|
|
user = db.query(models.User).filter(models.User.id == user_id).first()
|
|
if not user:
|
|
raise HTTPException(404, "User not found")
|
|
user.password_hash = get_password_hash(req.password)
|
|
db.commit()
|
|
return {"ok": True}
|