Skip to content
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

[FC-0049] feat: Update permissions to remove object tags #188

Merged
merged 3 commits into from
May 8, 2024
Merged

[FC-0049] feat: Update permissions to remove object tags #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c791682
feat: Update permissions to remove object tags
ChrisChV May 7, 2024
bf49f69
refactor: Update default value of can_remove_object_tag_objectid
ChrisChV May 8, 2024
0df63a1
style: Typo on tests
ChrisChV May 8, 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
2 changes: 1 addition & 1 deletion openedx_learning/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""
Open edX Learning ("Learning Core").
"""
__version__ = "0.9.2"
__version__ = "0.9.3"
9 changes: 8 additions & 1 deletion openedx_tagging/core/tagging/rest_api/v1/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,14 @@ class Meta:
fields = ["value", "lineage", "can_delete_objecttag"]

lineage = serializers.ListField(child=serializers.CharField(), source="get_lineage", read_only=True)
can_delete_objecttag = serializers.SerializerMethodField(method_name='get_can_delete')
can_delete_objecttag = serializers.SerializerMethodField()

def get_can_delete_objecttag(self, instance) -> bool | None:
"""
Returns True if the current request user may delete object tags on this taxonomy
"""
perm_name = f'{self.app_label}.remove_objecttag_objectid'
return self._can(perm_name, instance.object_id)


class ObjectTagSerializer(ObjectTagMinimalSerializer):
Expand Down
11 changes: 11 additions & 0 deletions openedx_tagging/core/tagging/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,16 @@ def can_change_object_tag_objectid(_user: UserType, _object_id: str) -> bool:
return False


@rules.predicate
def can_remove_object_tag_objectid(_user: UserType, _object_id: str) -> bool:
"""
Nobody can remove object tags without checking the permission for the tagged object.

This rule could be defined in other apps for proper permission checking.
"""
return can_change_object_tag_objectid(_user, _object_id)


@rules.predicate
def can_change_object_tag(
user: UserType, perm_obj: ObjectTagPermissionItem | None = None
Expand Down Expand Up @@ -194,3 +204,4 @@ def can_change_object_tag(
rules.add_perm("oel_tagging.view_objecttag_taxonomy", can_view_object_tag_taxonomy)
rules.add_perm("oel_tagging.change_objecttag_taxonomy", can_view_object_tag_taxonomy)
rules.add_perm("oel_tagging.change_objecttag_objectid", can_change_object_tag_objectid)
rules.add_perm("oel_tagging.remove_objecttag_objectid", can_remove_object_tag_objectid)
13 changes: 7 additions & 6 deletions tests/openedx_tagging/core/tagging/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,12 +767,12 @@ def test_retrieve_object_tags(self, user_attr, expected_status):
{
"value": "Mammalia",
"lineage": ["Eukaryota", "Animalia", "Chordata", "Mammalia"],
"can_delete_objecttag": True,
"can_delete_objecttag": False,
},
{
"value": "Fungi",
"lineage": ["Eukaryota", "Fungi"],
"can_delete_objecttag": True,
"can_delete_objecttag": False,
},
],
"export_id": "life_on_earth"
Expand All @@ -785,7 +785,7 @@ def test_retrieve_object_tags(self, user_attr, expected_status):
{
"value": "test_user_1",
"lineage": ["test_user_1"],
"can_delete_objecttag": True,
"can_delete_objecttag": False,
},
],
"export_id": "user_authors"
Expand Down Expand Up @@ -860,7 +860,7 @@ def test_retrieve_object_tags_sorted(self):
Test the sort order of the object tags retrieved from the get object
tags API.
"""
object_id, sort_test_applied_result = self.prepare_for_sort_test(expected_perm=True)
object_id, sort_test_applied_result = self.prepare_for_sort_test(expected_perm=False)

url = OBJECT_TAGS_RETRIEVE_URL.format(object_id=object_id)
self.client.force_authenticate(user=self.user_1)
Expand All @@ -874,7 +874,8 @@ def test_retrieve_object_tags_query_count(self):
Test how many queries are used when retrieving object tags and permissions
"""
expected_perm = True
object_id, sort_test_applied_result = self.prepare_for_sort_test(expected_perm)
expected_remove_perm = False
object_id, sort_test_applied_result = self.prepare_for_sort_test(expected_remove_perm)
url = OBJECT_TAGS_RETRIEVE_URL.format(object_id=object_id)

self.client.force_authenticate(user=self.user_1)
Expand Down Expand Up @@ -936,7 +937,7 @@ def test_retrieve_object_tags_taxonomy_queryparam(
{
"value": "test_user_1",
"lineage": ["test_user_1"],
"can_delete_objecttag": True,
"can_delete_objecttag": False,
},
],
"export_id": "user_authors",
Expand Down
Loading