@@ -6,7 +6,7 @@ from typing import List
|
||||
|
||||
from ..model.models import UserResponse, UserCreate, UserDB, UserUpdate
|
||||
from ..services.database import engine, get_session, add_and_refresh
|
||||
from ..services.auth import get_password_hash, get_current_user, auth_is_admin
|
||||
from ..services.auth import get_password_hash, get_current_user as auth_user, auth_is_admin
|
||||
|
||||
user_router = APIRouter(tags=["Users"], prefix="/api/v1/users")
|
||||
|
||||
@@ -22,6 +22,10 @@ def read_users(*, db: Session = Depends(get_session), admin: bool = Depends(auth
|
||||
users = db.exec(select(UserDB)).all()
|
||||
return users
|
||||
|
||||
@user_router.get("/current", response_model=UserResponse)
|
||||
def get_current_user(db: Session = Depends(get_session), user: UserDB = Depends(auth_user)):
|
||||
return user
|
||||
|
||||
@user_router.get("/{user_id}", response_model=UserResponse)
|
||||
def read_user(*, db: Session = Depends(get_session), user_id: int, admin: bool = Depends(auth_is_admin)):
|
||||
db_user = db.get(UserDB, user_id)
|
||||
@@ -49,4 +53,5 @@ def delete_user(*, db: Session = Depends(get_session), user_id: int, admin: bool
|
||||
raise HTTPException(status_code=404, detail="User not found")
|
||||
db.delete(db_user)
|
||||
db.commit()
|
||||
return {"message": "User deleted successfully"}
|
||||
return {"message": "User deleted successfully"}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user