Skip to content

🎨 The user can remove themselves from the project/workspace. 🚨 #6415

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 24, 2024
Merged

🎨 The user can remove themselves from the project/workspace. 🚨 #6415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b5f3abf
user can remove itself from project/workspace
matusdrobuliak66 Sep 20, 2024
479e675
Merge branch 'master' into allow-to-remove-your-self-from-the-group
matusdrobuliak66 Sep 20, 2024
e370e52
Merge branch 'master' into allow-to-remove-your-self-from-the-group
matusdrobuliak66 Sep 23, 2024
cfb631d
Merge branch 'allow-to-remove-your-self-from-the-group' of github.com…
matusdrobuliak66 Sep 23, 2024
9a25064
improve
matusdrobuliak66 Sep 23, 2024
e407ae0
improve
matusdrobuliak66 Sep 23, 2024
563d352
Merge branch 'master' into allow-to-remove-your-self-from-the-group
matusdrobuliak66 Sep 23, 2024
e0c7b2e
Merge branch 'master' into allow-to-remove-your-self-from-the-group
matusdrobuliak66 Sep 24, 2024
b2d2fd9
Merge branch 'master' into allow-to-remove-your-self-from-the-group
matusdrobuliak66 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions services/web/server/src/simcore_service_webserver/projects/_groups_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,19 +139,20 @@ async def delete_project_group(
group_id: GroupID,
product_name: ProductName,
) -> None:
await check_user_project_permission(
app,
project_id=project_id,
user_id=user_id,
product_name=product_name,
permission="delete",
)
user: dict = await users_api.get_user(app, user_id=user_id)
if user["primary_gid"] != group_id:
await check_user_project_permission(
app,
project_id=project_id,
user_id=user_id,
product_name=product_name,
permission="delete",
)

project_db: ProjectDBAPI = app[APP_PROJECT_DBAPI]
project = await project_db.get_project_db(project_id)
project_owner_user: dict = await users_api.get_user(app, project.prj_owner)
if project_owner_user["primary_gid"] == group_id:
user: dict = await users_api.get_user(app, user_id)
if user["primary_gid"] != project_owner_user["primary_gid"]:
# Only the owner of the project can delete the owner group
raise ProjectInvalidRightsError(
Expand Down
4 changes: 2 additions & 2 deletions services/web/server/src/simcore_service_webserver/workspaces/_groups_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,15 @@ async def delete_workspace_group(
group_id: GroupID,
product_name: ProductName,
) -> None:
user: dict = await users_api.get_user(app, user_id=user_id)
workspace: UserWorkspaceAccessRightsDB = await workspaces_db.get_workspace_for_user(
app=app, user_id=user_id, workspace_id=workspace_id, product_name=product_name
)
if workspace.my_access_rights.delete is False:
if user["primary_gid"] != group_id and workspace.my_access_rights.delete is False:
raise WorkspaceAccessForbiddenError(
reason=f"User does not have delete access to workspace {workspace_id}"
)
if workspace.owner_primary_gid == group_id:
user: dict = await users_api.get_user(app, user_id)
if user["primary_gid"] != workspace.owner_primary_gid:
# Only the owner of the workspace can delete the owner group
raise WorkspaceAccessForbiddenError(
Expand Down
Loading