Skip to content

Commit d1ff77f

Browse files
committed
Switch from user to group access rights class
1 parent 6d63023 commit d1ff77f

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

services/web/server/src/simcore_service_webserver/functions/_functions_service.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
FunctionClass,
55
FunctionClassSpecificData,
66
FunctionDB,
7+
FunctionGroupAccessRights,
78
FunctionID,
89
FunctionInputs,
910
FunctionInputSchema,
@@ -445,16 +446,15 @@ async def set_function_group_permissions(
445446
user_id: UserID,
446447
product_name: ProductName,
447448
function_id: FunctionID,
448-
permission_group_id: GroupID,
449-
permissions: FunctionUserAccessRights,
449+
permissions: FunctionGroupAccessRights,
450450
) -> None:
451451
await _functions_repository.set_group_permissions(
452452
app=app,
453453
user_id=user_id,
454454
product_name=product_name,
455455
object_ids=[function_id],
456456
object_type="function",
457-
permission_group_id=permission_group_id,
457+
permission_group_id=permissions.group_id,
458458
read=permissions.read,
459459
write=permissions.write,
460460
execute=permissions.execute,

services/web/server/tests/unit/with_dbs/04/functions/test_functions_service.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from aiohttp.test_utils import TestClient
55
from common_library.users_enums import UserRole
66
from models_library.api_schemas_webserver.functions import ProjectFunction
7-
from models_library.functions import FunctionUserAccessRights
7+
from models_library.functions import FunctionGroupAccessRights
88
from models_library.functions_errors import FunctionReadAccessDeniedError
99
from models_library.products import ProductName
1010
from pytest_simcore.helpers.webserver_users import UserInfoDict
@@ -58,10 +58,12 @@ async def test_set_and_remove_group_permissions(
5858
app=client.app,
5959
user_id=logged_user["id"],
6060
product_name=osparc_product_name,
61-
permission_group_id=int(other_logged_user["primary_gid"]),
6261
function_id=registered_function.uid,
63-
permissions=FunctionUserAccessRights(
64-
user_id=logged_user["id"], read=True, write=True, execute=False
62+
permissions=FunctionGroupAccessRights(
63+
group_id=int(other_logged_user["primary_gid"]),
64+
read=True,
65+
write=True,
66+
execute=False,
6567
),
6668
)
6769

0 commit comments

Comments
 (0)