feat: Consolidate Admin User APIs (#5050)

Co-authored-by: Kuchenpirat <24235032+Kuchenpirat@users.noreply.github.com>

mealie/routes/admin/admin_management_users.py

@@ -1,6 +1,6 @@
 from functools import cached_property
 
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends, HTTPException, status
 from pydantic import UUID4
 
 from mealie.core import security
@@ -42,6 +42,11 @@ class AdminUserManagementRoutes(BaseAdminController):
 
     @router.post("", response_model=UserOut, status_code=201)
     def create_one(self, data: UserIn):
+        if self.repos.users.get_by_username(data.username):
+            raise HTTPException(status.HTTP_409_CONFLICT, {"message": self.t("exceptions.username-conflict-error")})
+        elif self.repos.users.get_one(data.email, "email"):
+            raise HTTPException(status.HTTP_409_CONFLICT, {"message": self.t("exceptions.email-conflict-error")})
+
         data.password = security.hash_password(data.password)
         return self.mixins.create_one(data)
 

mealie/routes/users/__init__.py

@@ -9,7 +9,6 @@ router = APIRouter()
 
 router.include_router(registration.router, prefix=user_prefix, tags=["Users: Registration"])
 router.include_router(crud.user_router)
-router.include_router(crud.admin_router)
 router.include_router(forgot_password.router, prefix=user_prefix, tags=["Users: Passwords"])
 router.include_router(images.router, prefix=user_prefix, tags=["Users: Images"])
 router.include_router(api_tokens.router)

mealie/routes/users/crud.py

@@ -1,52 +1,17 @@
-from fastapi import Depends, HTTPException, status
+from fastapi import HTTPException, status
 from pydantic import UUID4
 
 from mealie.core.security import hash_password
 from mealie.core.security.providers.credentials_provider import CredentialsProvider
 from mealie.db.models.users.users import AuthMethod
-from mealie.routes._base import BaseAdminController, BaseUserController, controller
-from mealie.routes._base.mixins import HttpRepo
-from mealie.routes._base.routers import AdminAPIRouter, UserAPIRouter
+from mealie.routes._base import BaseUserController, controller
+from mealie.routes._base.routers import UserAPIRouter
 from mealie.routes.users._helpers import assert_user_change_allowed
 from mealie.schema.response import ErrorResponse, SuccessResponse
-from mealie.schema.response.pagination import PaginationQuery
-from mealie.schema.user import ChangePassword, UserBase, UserIn, UserOut
-from mealie.schema.user.user import UserPagination, UserRatings, UserRatingSummary
+from mealie.schema.user import ChangePassword, UserBase, UserOut
+from mealie.schema.user.user import UserRatings, UserRatingSummary
 
 user_router = UserAPIRouter(prefix="/users", tags=["Users: CRUD"])
-admin_router = AdminAPIRouter(prefix="/users", tags=["Users: Admin CRUD"])
-
-
-@controller(admin_router)
-class AdminUserController(BaseAdminController):
-    @property
-    def mixins(self) -> HttpRepo:
-        return HttpRepo[UserIn, UserOut, UserBase](self.repos.users, self.logger)
-
-    @admin_router.get("", response_model=UserPagination)
-    def get_all(self, q: PaginationQuery = Depends(PaginationQuery)):
-        """Returns all users from all groups"""
-
-        response = self.repos.users.page_all(
-            pagination=q,
-            override=UserOut,
-        )
-
-        response.set_pagination_guides(admin_router.url_path_for("get_all"), q.model_dump())
-        return response
-
-    @admin_router.post("", response_model=UserOut, status_code=201)
-    def create_user(self, new_user: UserIn):
-        new_user.password = hash_password(new_user.password)
-        return self.mixins.create_one(new_user)
-
-    @admin_router.get("/{item_id}", response_model=UserOut)
-    def get_user(self, item_id: UUID4):
-        return self.mixins.get_one(item_id)
-
-    @admin_router.delete("/{item_id}")
-    def delete_user(self, item_id: UUID4):
-        self.mixins.delete_one(item_id)
 
 
 @controller(user_router)