Added Roles and Permissions. Some minor UI fixes

backend/users/router.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, Query
 from typing import Optional, List
 from auth.models import TokenPayload
-from auth.dependencies import require_user_access, require_viewer
+from auth.dependencies import require_permission
 from users.models import (
     UserCreate, UserUpdate, UserInDB, UserListResponse,
 )
@@ -14,7 +14,7 @@ router = APIRouter(prefix="/api/users", tags=["users"])
 async def list_users(
     search: Optional[str] = Query(None),
     status: Optional[str] = Query(None),
-    _user: TokenPayload = Depends(require_viewer),
+    _user: TokenPayload = Depends(require_permission("app_users", "view")),
 ):
     users = service.list_users(search=search, status=status)
     return UserListResponse(users=users, total=len(users))
@@ -23,7 +23,7 @@ async def list_users(
 @router.get("/{user_id}", response_model=UserInDB)
 async def get_user(
     user_id: str,
-    _user: TokenPayload = Depends(require_viewer),
+    _user: TokenPayload = Depends(require_permission("app_users", "view")),
 ):
     return service.get_user(user_id)
 
@@ -31,7 +31,7 @@ async def get_user(
 @router.post("", response_model=UserInDB, status_code=201)
 async def create_user(
     body: UserCreate,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "add")),
 ):
     return service.create_user(body)
 
@@ -40,7 +40,7 @@ async def create_user(
 async def update_user(
     user_id: str,
     body: UserUpdate,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "edit")),
 ):
     return service.update_user(user_id, body)
 
@@ -48,7 +48,7 @@ async def update_user(
 @router.delete("/{user_id}", status_code=204)
 async def delete_user(
     user_id: str,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "delete")),
 ):
     service.delete_user(user_id)
 
@@ -56,7 +56,7 @@ async def delete_user(
 @router.post("/{user_id}/block", response_model=UserInDB)
 async def block_user(
     user_id: str,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "edit")),
 ):
     return service.block_user(user_id)
 
@@ -64,7 +64,7 @@ async def block_user(
 @router.post("/{user_id}/unblock", response_model=UserInDB)
 async def unblock_user(
     user_id: str,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "edit")),
 ):
     return service.unblock_user(user_id)
 
@@ -72,7 +72,7 @@ async def unblock_user(
 @router.get("/{user_id}/devices", response_model=List[dict])
 async def get_user_devices(
     user_id: str,
-    _user: TokenPayload = Depends(require_viewer),
+    _user: TokenPayload = Depends(require_permission("app_users", "view")),
 ):
     return service.get_user_devices(user_id)
 
@@ -81,7 +81,7 @@ async def get_user_devices(
 async def assign_device(
     user_id: str,
     device_id: str,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "edit")),
 ):
     return service.assign_device(user_id, device_id)
 
@@ -90,6 +90,6 @@ async def assign_device(
 async def unassign_device(
     user_id: str,
     device_id: str,
-    _user: TokenPayload = Depends(require_user_access),
+    _user: TokenPayload = Depends(require_permission("app_users", "edit")),
 ):
     return service.unassign_device(user_id, device_id)