Skip to content

Hotfix: private project mapping and validation permission checks team membership along with project allowed users #7050

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
nischalstha9 merged 2 commits into from
Oct 15, 2025
Merged

Hotfix: private project mapping and validation permission checks team membership along with project allowed users #7050

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a288bb
private project mapping and validation permission checks team members…
prabinoid Oct 15, 2025
1639ec5
Merge pull request #7049 from hotosm/fix/private-project-perm
ramyaragupathy Oct 15, 2025
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
20 changes: 17 additions & 3 deletions backend/services/project_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,17 @@ async def is_user_permitted_to_map(project_id: int, user_id: int, db: Database):
is_allowed_user = await ProjectService.is_user_in_the_allowed_list(
project.id, user_id, db
)
if not is_allowed_user:

allowed_roles = [
TeamRoles.MAPPER.value,
TeamRoles.VALIDATOR.value,
TeamRoles.PROJECT_MANAGER.value,
]

is_team_member = await TeamService.check_team_membership(
project.id, allowed_roles, user_id, db
)
if not (is_allowed_user or is_team_member):
return False, MappingNotAllowed.USER_NOT_ON_ALLOWED_LIST

return True, "User allowed to map"
Expand All @@ -444,6 +454,7 @@ async def is_user_permitted_to_map(project_id: int, user_id: int, db: Database):
async def has_validation_permission(
project: Project, user_id: int, validation_permission: int, db: Database
):

allowed_roles = [TeamRoles.VALIDATOR.value, TeamRoles.PROJECT_MANAGER.value]
is_team_member = await TeamService.check_team_membership(
project.id, allowed_roles, user_id, db
Expand Down Expand Up @@ -517,8 +528,11 @@ async def is_user_permitted_to_validate(
is_allowed_user = await ProjectService.is_user_in_the_allowed_list(
project_id, user_id, db
)

if not is_allowed_user:
allowed_roles = [TeamRoles.VALIDATOR.value, TeamRoles.PROJECT_MANAGER.value]
is_team_member = await TeamService.check_team_membership(
project.id, allowed_roles, user_id, db
)
if not (is_allowed_user or is_team_member):
return False, ValidatingNotAllowed.USER_NOT_ON_ALLOWED_LIST

return True, "User allowed to validate"
Expand Down
Loading