Merge branch '3.0' into image-management-refactoring

gns3server/api/routes/controller/groups.py

@@ -19,7 +19,7 @@
 API routes for user groups.
 """
 
-from fastapi import APIRouter, Depends, status
+from fastapi import APIRouter, Depends, Response, status
 from uuid import UUID
 from typing import List
 
@@ -113,7 +113,7 @@ async def update_user_group(
 async def delete_user_group(
     user_group_id: UUID,
     users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
-) -> None:
+) -> Response:
     """
     Delete an user group
     """
@@ -129,6 +129,8 @@ async def delete_user_group(
     if not success:
         raise ControllerError(f"User group '{user_group_id}' could not be deleted")
 
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
 
 @router.get("/{user_group_id}/members", response_model=List[schemas.User])
 async def get_user_group_members(
@@ -150,7 +152,7 @@ async def add_member_to_group(
         user_group_id: UUID,
         user_id: UUID,
         users_repo: UsersRepository = Depends(get_repository(UsersRepository))
-) -> None:
+) -> Response:
     """
     Add member to an user group.
     """
@@ -163,6 +165,8 @@ async def add_member_to_group(
     if not user_group:
         raise ControllerNotFoundError(f"User group '{user_group_id}' not found")
 
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
 
 @router.delete(
     "/{user_group_id}/members/{user_id}",
@@ -172,7 +176,7 @@ async def remove_member_from_group(
     user_group_id: UUID,
     user_id: UUID,
     users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
-) -> None:
+) -> Response:
     """
     Remove member from an user group.
     """
@@ -185,6 +189,8 @@ async def remove_member_from_group(
     if not user_group:
         raise ControllerNotFoundError(f"User group '{user_group_id}' not found")
 
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
 
 @router.get("/{user_group_id}/roles", response_model=List[schemas.Role])
 async def get_user_group_roles(
@@ -207,7 +213,7 @@ async def add_role_to_group(
         role_id: UUID,
         users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
         rbac_repo: RbacRepository = Depends(get_repository(RbacRepository))
-) -> None:
+) -> Response:
     """
     Add role to an user group.
     """
@@ -220,6 +226,8 @@ async def add_role_to_group(
     if not user_group:
         raise ControllerNotFoundError(f"User group '{user_group_id}' not found")
 
+    return Response(status_code=status.HTTP_204_NO_CONTENT)
+
 
 @router.delete(
     "/{user_group_id}/roles/{role_id}",
@@ -230,7 +238,7 @@ async def remove_role_from_group(
     role_id: UUID,
     users_repo: UsersRepository = Depends(get_repository(UsersRepository)),
     rbac_repo: RbacRepository = Depends(get_repository(RbacRepository))
-) -> None:
+) -> Response:
     """
     Remove role from an user group.
     """
@@ -242,3 +250,5 @@ async def remove_role_from_group(
     user_group = await users_repo.remove_role_from_user_group(user_group_id, role)
     if not user_group:
         raise ControllerNotFoundError(f"User group '{user_group_id}' not found")
+
+    return Response(status_code=status.HTTP_204_NO_CONTENT)