Skip to content

Commit b243dc3

Browse files
fix: access rights no more nullable
1 parent 4a98be7 commit b243dc3

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

packages/models-library/src/models_library/api_schemas_webserver/functions.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema):
130130
uid: Annotated[FunctionID, Field(alias="uuid")]
131131
created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
132132
modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
133-
access_rights: dict[GroupID, FunctionGroupAccessRightsGet] | None = None
133+
access_rights: dict[GroupID, FunctionGroupAccessRightsGet]
134134
thumbnail: HttpUrl | None = None
135135

136136

@@ -139,7 +139,7 @@ class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
139139
project_id: Annotated[ProjectID, Field(alias="templateId")]
140140
created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
141141
modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
142-
access_rights: dict[GroupID, FunctionGroupAccessRightsGet] | None = None
142+
access_rights: dict[GroupID, FunctionGroupAccessRightsGet]
143143
thumbnail: HttpUrl | None = None
144144

145145

services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rest.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ async def _build_function_group_access_rights(
5858
product_name: ProductName,
5959
function_id: FunctionID,
6060
) -> dict[GroupID, FunctionGroupAccessRightsGet]:
61-
access_rights_list = await _functions_service.get_function_group_permissions(
61+
access_rights_list = await _functions_service.list_function_group_permissions(
6262
app=app,
6363
user_id=user_id,
6464
product_name=product_name,
@@ -144,9 +144,17 @@ async def register_function(request: web.Request) -> web.Response:
144144
)
145145
)
146146

147+
access_rights = await _build_function_group_access_rights(
148+
request.app,
149+
user_id=req_ctx.user_id,
150+
product_name=req_ctx.product_name,
151+
function_id=registered_function.uid,
152+
)
153+
147154
return envelope_json_response(
148155
TypeAdapter(RegisteredFunctionGet).validate_python(
149156
registered_function.model_dump(mode="json")
157+
| {"access_rights": access_rights}
150158
),
151159
web.HTTPCreated,
152160
)
@@ -380,7 +388,7 @@ async def get_function_groups(request: web.Request) -> web.Response:
380388
function_id = path_params.function_id
381389

382390
req_ctx = AuthenticatedRequestContext.model_validate(request)
383-
access_rights_list = await _functions_service.get_function_group_permissions(
391+
access_rights_list = await _functions_service.list_function_group_permissions(
384392
request.app,
385393
user_id=req_ctx.user_id,
386394
product_name=req_ctx.product_name,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ async def get_function_user_permissions(
458458
)
459459

460460

461-
async def get_function_group_permissions(
461+
async def list_function_group_permissions(
462462
app: web.Application,
463463
*,
464464
user_id: UserID,

0 commit comments

Comments
 (0)