1 files changed, 13 insertions, 4 deletions
diff --git a/packages/meshbay-hub/src/meshbay_hub/api/deps.py b/packages/meshbay-hub/src/meshbay_hub/api/deps.py
index 1bf57a4..907a481 100644
--- a/packages/meshbay-hub/src/meshbay_hub/api/deps.py
+++ b/packages/meshbay-hub/src/meshbay_hub/api/deps.py
@@ -72,11 +72,21 @@ async def require_user_scope(
     return current_user
 
 
+def user_is_admin(user: User) -> bool:
+    """Admin by DB role or by the config allow-list. Use inside a handler that
+    already depends on `require_moderator` but has to draw the admin line for
+    one field (see `admin_patch_user`)."""
+    return user.role == "admin" or user.username in _admin_usernames
+
+
+def user_is_moderator(user: User) -> bool:
+    return user.role in ("moderator", "admin") or user.username in _admin_usernames
+
+
 async def require_moderator(
     current_user: User = Depends(get_current_user),
 ) -> User:
-    if current_user.role not in ("moderator", "admin") \
-       and current_user.username not in _admin_usernames:
+    if not user_is_moderator(current_user):
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN,
                             detail="Moderator access required")
     return current_user
@@ -85,8 +95,7 @@ async def require_moderator(
 async def require_admin(
     current_user: User = Depends(get_current_user),
 ) -> User:
-    if current_user.role != "admin" \
-       and current_user.username not in _admin_usernames:
+    if not user_is_admin(current_user):
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN,
                             detail="Admin access required")
     return current_user