Skip to content

API FIX: Accept/decline access request - Use project roles for permission checks, not project access. #197

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 1 commit into from
Mar 18, 2024
Merged

API FIX: Accept/decline access request - Use project roles for permission checks, not project access. #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions server/mergin/sync/private_api_controller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
require_project_by_uuid,
ProjectPermissions,
check_workspace_permissions,
get_user_project_role,
)
from ..utils import parse_order_params, split_order_param, get_order_param
from mergin.config import Configuration
Expand Down Expand Up @@ -92,10 +93,10 @@ def decline_project_access_request(request_id): # noqa: E501
)
.first_or_404()
)

project = access_request.project
project_role = get_user_project_role(project, current_user)
if (
current_user.id in access_request.project.access.owners
or current_user.id == access_request.project.creator
project_role == ProjectRole.OWNER.value
or current_user.id == access_request.requested_by
):
access_request.resolve(RequestStatus.DECLINED, current_user.id)
Expand All @@ -120,10 +121,9 @@ def accept_project_access_request(request_id):
)
.first_or_404()
)
if (
current_user.id in access_request.project.access.owners
or current_user.id == access_request.project.creator
):
project = access_request.project
project_role = get_user_project_role(project, current_user)
if project_role == ProjectRole.OWNER.value:
project_access_granted.send(
access_request.project, user_id=access_request.requested_by
)
Expand Down