gid

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/simcore_webserver_groups_fixtures.py

@@ -93,15 +93,15 @@ async def standard_groups_owner(
         await add_user_in_group(
             app=client.app,
             user_id=owner_user["id"],
-            gid=sparc_group["gid"],
+            group_id=sparc_group["gid"],
             new_user_id=logged_user["id"],
         )
 
         # adds logged_user  to team-black group
         await add_user_in_group(
             app=client.app,
             user_id=owner_user["id"],
-            gid=team_black_group["gid"],
+            group_id=team_black_group["gid"],
             new_user_email=logged_user["email"],
         )
 

services/web/server/src/simcore_service_webserver/garbage_collector/_core_utils.py

@@ -78,7 +78,7 @@ async def get_new_project_owner_gid(
     standard_groups = {}  # groups of users, multiple users can be part of this
     primary_groups = {}  # each individual user has a unique primary group
     for other_gid in other_users_access_rights:
-        group: Group | None = await get_group_from_gid(app=app, gid=int(other_gid))
+        group: Group | None = await get_group_from_gid(app=app, group_id=int(other_gid))
 
         # only process for users and groups with write access right
         if group is None:

services/web/server/src/simcore_service_webserver/groups/_groups_api.py

@@ -21,8 +21,8 @@
 #
 
 
-async def get_group_from_gid(app: web.Application, gid: GroupID) -> Group | None:
-    group_db = await _groups_db.get_group_from_gid(app, gid=gid)
+async def get_group_from_gid(app: web.Application, group_id: GroupID) -> Group | None:
+    group_db = await _groups_db.get_group_from_gid(app, group_id=group_id)
 
     if group_db:
         return Group.model_construct(**group_db.model_dump())
@@ -119,7 +119,7 @@ async def get_organization(
     raises GroupNotFoundError
     raises UserInsufficientRightsError
     """
-    return await _groups_db.get_user_group(app, user_id=user_id, gid=group_id)
+    return await _groups_db.get_user_group(app, user_id=user_id, group_9d=group_id)
 
 
 async def update_organization(
@@ -160,34 +160,37 @@ async def delete_organization(
 
 
 async def list_users_in_group(
-    app: web.Application, user_id: UserID, gid: GroupID
+    app: web.Application, user_id: UserID, group_id: GroupID
 ) -> list[GroupMember]:
-    return await _groups_db.list_users_in_group(app, user_id=user_id, group_id=gid)
+    return await _groups_db.list_users_in_group(app, user_id=user_id, group_id=group_id)
 
 
 async def get_user_in_group(
     app: web.Application,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     the_user_id_in_group: UserID,
 ) -> GroupMember:
 
     return await _groups_db.get_user_in_group(
-        app, user_id=user_id, group_id=gid, the_user_id_in_group=the_user_id_in_group
+        app,
+        user_id=user_id,
+        group_id=group_id,
+        the_user_id_in_group=the_user_id_in_group,
     )
 
 
 async def update_user_in_group(
     app: web.Application,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     the_user_id_in_group: UserID,
     access_rights: AccessRightsDict,
 ) -> GroupMember:
     return await _groups_db.update_user_in_group(
         app,
         user_id=user_id,
-        gid=gid,
+        group_id=group_id,
         the_user_id_in_group=the_user_id_in_group,
         access_rights=access_rights,
     )
@@ -196,11 +199,14 @@ async def update_user_in_group(
 async def delete_user_in_group(
     app: web.Application,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     the_user_id_in_group: UserID,
 ) -> None:
     return await _groups_db.delete_user_from_group(
-        app, user_id=user_id, gid=gid, the_user_id_in_group=the_user_id_in_group
+        app,
+        user_id=user_id,
+        group_id=group_id,
+        the_user_id_in_group=the_user_id_in_group,
     )
 
 
@@ -233,7 +239,7 @@ async def auto_add_user_to_product_group(
 async def add_user_in_group(
     app: web.Application,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     *,
     new_user_id: UserID | None = None,
     new_user_email: EmailStr | None = None,
@@ -250,6 +256,7 @@ async def add_user_in_group(
         msg = "Invalid method call, missing user id or user email"
         raise GroupsError(msg=msg)
 
+    # FIXME: check privacy
     if new_user_email:
         user = await _groups_db.get_user_from_email(app, email=new_user_email)
         new_user_id = user.id
@@ -261,7 +268,7 @@ async def add_user_in_group(
     return await _groups_db.add_new_user_in_group(
         app,
         user_id=user_id,
-        gid=gid,
+        group_id=group_id,
         new_user_id=new_user_id,
         access_rights=access_rights,
     )

services/web/server/src/simcore_service_webserver/groups/_groups_db.py

@@ -121,6 +121,8 @@ async def get_user_from_email(
         UserNotFoundError
 
     """
+    # FIXME: check privacy
+
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(sa.select(users).where(users.c.email == email))
         user = await result.fetchone()
@@ -135,10 +137,13 @@ async def get_user_from_email(
 
 
 async def get_group_from_gid(
-    app: web.Application, connection: AsyncConnection | None = None, *, gid: GroupID
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    group_id: GroupID,
 ) -> Group | None:
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
-        row = await conn.stream(groups.select().where(groups.c.gid == gid))
+        row = await conn.stream(groups.select().where(groups.c.gid == group_id))
         result = await row.first()
         if result:
             return Group.model_validate(result)
@@ -219,7 +224,7 @@ async def get_user_group(
     connection: AsyncConnection | None = None,
     *,
     user_id: UserID,
-    gid: GroupID,
+    group_9d: GroupID,
 ) -> tuple[Group, AccessRightsDict]:
     """
     Gets group gid if user associated to it and has read access
@@ -229,9 +234,9 @@ async def get_user_group(
     """
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         row = await _get_group_and_access_rights_or_raise(
-            conn, user_id=user_id, gid=gid
+            conn, user_id=user_id, gid=group_9d
         )
-        _check_group_permissions(row, user_id, gid, "read")
+        _check_group_permissions(row, user_id, group_9d, "read")
 
         group, access_rights = _to_group_info_tuple(row)
         return group, access_rights
@@ -463,7 +468,7 @@ async def update_user_in_group(
     connection: AsyncConnection | None = None,
     *,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     the_user_id_in_group: UserID,
     access_rights: AccessRightsDict,
 ) -> GroupMember:
@@ -475,13 +480,16 @@ async def update_user_in_group(
 
         # first check if the group exists
         group = await _get_group_and_access_rights_or_raise(
-            conn, user_id=user_id, gid=gid
+            conn, user_id=user_id, gid=group_id
         )
-        _check_group_permissions(group, user_id, gid, "write")
+        _check_group_permissions(group, user_id, group_id, "write")
 
         # now check the user exists
         the_user = await _get_user_in_group(
-            conn, caller_user_id=user_id, group_id=gid, user_id=the_user_id_in_group
+            conn,
+            caller_user_id=user_id,
+            group_id=group_id,
+            user_id=the_user_id_in_group,
         )
 
         # modify the user access rights
@@ -493,7 +501,7 @@ async def update_user_in_group(
             .where(
                 and_(
                     user_to_groups.c.uid == the_user_id_in_group,
-                    user_to_groups.c.gid == gid,
+                    user_to_groups.c.gid == group_id,
                 )
             )
         )
@@ -507,19 +515,22 @@ async def delete_user_from_group(
     connection: AsyncConnection | None = None,
     *,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     the_user_id_in_group: UserID,
 ) -> None:
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         # first check if the group exists
         group = await _get_group_and_access_rights_or_raise(
-            conn, user_id=user_id, gid=gid
+            conn, user_id=user_id, gid=group_id
         )
-        _check_group_permissions(group, user_id, gid, "write")
+        _check_group_permissions(group, user_id, group_id, "write")
 
         # check the user exists
         await _get_user_in_group(
-            conn, caller_user_id=user_id, group_id=gid, user_id=the_user_id_in_group
+            conn,
+            caller_user_id=user_id,
+            group_id=group_id,
+            user_id=the_user_id_in_group,
         )
 
         # delete him/her
@@ -528,7 +539,7 @@ async def delete_user_from_group(
             user_to_groups.delete().where(
                 and_(
                     user_to_groups.c.uid == the_user_id_in_group,
-                    user_to_groups.c.gid == gid,
+                    user_to_groups.c.gid == group_id,
                 )
             )
         )
@@ -562,7 +573,7 @@ async def add_new_user_in_group(
     connection: AsyncConnection | None = None,
     *,
     user_id: UserID,
-    gid: GroupID,
+    group_id: GroupID,
     new_user_id: UserID,
     access_rights: AccessRightsDict | None = None,
 ) -> None:
@@ -572,17 +583,17 @@ async def add_new_user_in_group(
     async with transaction_context(get_asyncpg_engine(app), connection) as conn:
         # first check if the group exists
         group = await _get_group_and_access_rights_or_raise(
-            conn, user_id=user_id, gid=gid
+            conn, user_id=user_id, gid=group_id
         )
-        _check_group_permissions(group, user_id, gid, "write")
+        _check_group_permissions(group, user_id, group_id, "write")
 
         # now check the new user exists
         users_count = await conn.scalar(
             sa.select(sa.func.count()).where(users.c.id == new_user_id)
         )
         if not users_count:
             assert new_user_id is not None  # nosec
-            raise UserInGroupNotFoundError(uid=new_user_id, gid=gid)
+            raise UserInGroupNotFoundError(uid=new_user_id, gid=group_id)
 
         # add the new user to the group now
         user_access_rights = _DEFAULT_GROUP_READ_ACCESS_RIGHTS
@@ -598,7 +609,10 @@ async def add_new_user_in_group(
             )
         except UniqueViolation as exc:
             raise UserAlreadyInGroupError(
-                uid=new_user_id, gid=gid, user_id=user_id, access_rights=access_rights
+                uid=new_user_id,
+                gid=group_id,
+                user_id=user_id,
+                access_rights=access_rights,
             ) from exc
 
 

services/web/server/src/simcore_service_webserver/groups/_groups_handlers.py

@@ -227,7 +227,7 @@ async def update_group_user(request: web.Request):
     user = await _groups_api.update_user_in_group(
         request.app,
         user_id=req_ctx.user_id,
-        gid=path_params.gid,
+        group_id=path_params.gid,
         the_user_id_in_group=path_params.uid,
         access_rights=update.access_rights.model_dump(mode="json"),  # type: ignore[arg-type]
     )

services/web/server/src/simcore_service_webserver/projects/_nodes_handlers.py

@@ -559,7 +559,7 @@ async def get_project_services_access_for_gid(
 
     # Get the group from the provided group ID
     _sharing_with_group: Group | None = await get_group_from_gid(
-        app=request.app, gid=query_params.for_gid
+        app=request.app, group_id=query_params.for_gid
     )
 
     # Check if the group exists