Users

loon/web/admin/router.py

@@ -7,8 +7,8 @@ from loon.web.auth.middleware import admin
 from loon.web.db import engine
 from loon.web.logs.models import LogEntry
 from loon.web.logs.schema import LogEntryResponse
-from loon.web.users.models import MinecraftUser
-from loon.web.users.schema import MinecraftUserPublic
+from loon.web.users.models import MinecraftUser, User
+from loon.web.users.schema import MinecraftUserPublic, UserPublic
 
 router = APIRouter(prefix="/admin", tags=["admin"])
 
@@ -40,3 +40,15 @@ async def list_mc_users(request: Request):
     with Session(engine) as session:
         statement = select(MinecraftUser).order_by(MinecraftUser.username)
         return session.exec(statement).all()
+
+
+@router.get("/users", response_model=list[UserPublic])
+@admin
+async def list_users(request: Request):
+    with Session(engine) as session:
+        statement = (
+            select(User)
+            .options(selectinload(User.minecraft_user))
+            .order_by(User.internal_username)
+        )
+        return session.exec(statement).all()