feat: add username-based user lookup and permission introspection endpoint
- users router: accept username or id in get/update/delete/worklogs via _find_user_by_id_or_username() - auth router: add GET /auth/me/permissions for CLI help introspection (token → user → role → permissions)
This commit is contained in:
@@ -102,31 +102,40 @@ def list_users(
|
||||
return db.query(models.User).order_by(models.User.created_at.desc()).offset(skip).limit(limit).all()
|
||||
|
||||
|
||||
@router.get("/{user_id}", response_model=schemas.UserResponse)
|
||||
def _find_user_by_id_or_username(db: Session, identifier: str) -> models.User | None:
|
||||
"""Resolve a user by numeric id or username string."""
|
||||
try:
|
||||
uid = int(identifier)
|
||||
return db.query(models.User).filter(models.User.id == uid).first()
|
||||
except ValueError:
|
||||
return db.query(models.User).filter(models.User.username == identifier).first()
|
||||
|
||||
|
||||
@router.get("/{identifier}", response_model=schemas.UserResponse)
|
||||
def get_user(
|
||||
user_id: int,
|
||||
identifier: str,
|
||||
db: Session = Depends(get_db),
|
||||
_: models.User = Depends(require_admin),
|
||||
):
|
||||
user = db.query(models.User).filter(models.User.id == user_id).first()
|
||||
user = _find_user_by_id_or_username(db, identifier)
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
return user
|
||||
|
||||
|
||||
@router.patch("/{user_id}", response_model=schemas.UserResponse)
|
||||
@router.patch("/{identifier}", response_model=schemas.UserResponse)
|
||||
def update_user(
|
||||
user_id: int,
|
||||
identifier: str,
|
||||
payload: schemas.UserUpdate,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: models.User = Depends(require_admin),
|
||||
):
|
||||
user = db.query(models.User).filter(models.User.id == user_id).first()
|
||||
user = _find_user_by_id_or_username(db, identifier)
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
|
||||
if payload.email is not None and payload.email != user.email:
|
||||
existing = db.query(models.User).filter(models.User.email == payload.email, models.User.id != user_id).first()
|
||||
existing = db.query(models.User).filter(models.User.email == payload.email, models.User.id != user.id).first()
|
||||
if existing:
|
||||
raise HTTPException(status_code=400, detail="Email already exists")
|
||||
user.email = payload.email
|
||||
@@ -153,13 +162,13 @@ def update_user(
|
||||
return user
|
||||
|
||||
|
||||
@router.delete("/{user_id}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
@router.delete("/{identifier}", status_code=status.HTTP_204_NO_CONTENT)
|
||||
def delete_user(
|
||||
user_id: int,
|
||||
identifier: str,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: models.User = Depends(require_admin),
|
||||
):
|
||||
user = db.query(models.User).filter(models.User.id == user_id).first()
|
||||
user = _find_user_by_id_or_username(db, identifier)
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
if current_user.id == user.id:
|
||||
@@ -186,13 +195,16 @@ class WorkLogResponse(BaseModel):
|
||||
from_attributes = True
|
||||
|
||||
|
||||
@router.get("/{user_id}/worklogs", response_model=List[WorkLogResponse])
|
||||
@router.get("/{identifier}/worklogs", response_model=List[WorkLogResponse])
|
||||
def list_user_worklogs(
|
||||
user_id: int,
|
||||
identifier: str,
|
||||
limit: int = 50,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: models.User = Depends(get_current_user),
|
||||
):
|
||||
if current_user.id != user_id and not current_user.is_admin:
|
||||
user = _find_user_by_id_or_username(db, identifier)
|
||||
if not user:
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
if current_user.id != user.id and not current_user.is_admin:
|
||||
raise HTTPException(status_code=403, detail="Forbidden")
|
||||
return db.query(WorkLog).filter(WorkLog.user_id == user_id).order_by(WorkLog.logged_date.desc()).limit(limit).all()
|
||||
return db.query(WorkLog).filter(WorkLog.user_id == user.id).order_by(WorkLog.logged_date.desc()).limit(limit).all()
|
||||
|
||||
Reference in New Issue
Block a user