wbcore 1.61.2__py2.py3-none-any.whl → 1.61.4__py2.py3-none-any.whl

wbcore/contrib/documents/viewsets/documents.py

@@ -24,10 +24,10 @@ from wbcore.contrib.documents.viewsets.display import DocumentModelDisplay
 from wbcore.contrib.documents.viewsets.endpoints import DocumentEndpointConfig
 from wbcore.contrib.documents.viewsets.previews import DocumentPreviewConfig
 from wbcore.contrib.documents.viewsets.titles import DocumentModelTitleConfig
-from wbcore.contrib.guardian.viewsets.mixins import GuardianFilterMixin
+from wbcore.contrib.permission.viewsets.mixins import ObjectPermissionFilterMixin
 
 
-class DocumentModelViewSet(GuardianFilterMixin, viewsets.ModelViewSet):
+class DocumentModelViewSet(ObjectPermissionFilterMixin, viewsets.ModelViewSet):
     LIST_DOCUMENTATION = "documents/markdown/documentation/documents.md"
     search_fields = ("name",)
     ordering = ["-updated", "name"]
@@ -101,7 +101,7 @@ class DocumentModelViewSet(GuardianFilterMixin, viewsets.ModelViewSet):
         return HttpResponse("Document could not be found", status=status.HTTP_404_NOT_FOUND)
 
 
-class DocumentRepresentationViewSet(GuardianFilterMixin, viewsets.RepresentationViewSet):
+class DocumentRepresentationViewSet(ObjectPermissionFilterMixin, viewsets.RepresentationViewSet):
     IDENTIFIER = "wbcore:documents:documentrepresentation"
     serializer_class = DocumentRepresentationSerializer
     queryset = Document.objects.all()

wbcore/contrib/geography/viewsets/geography.py

@@ -3,7 +3,7 @@ from django.db.models.expressions import Value
 from rest_framework.filters import OrderingFilter
 
 from wbcore import viewsets
-from wbcore.contrib.guardian.filters import ObjectPermissionsFilter
+from wbcore.contrib.permission.filters import ObjectPermissionsFilter
 from wbcore.viewsets.mixins import DjangoFilterBackend
 
 from ..models import Geography

wbcore/contrib/permission/apps.py

@@ -0,0 +1,15 @@
+from django.apps import AppConfig
+from django.db.models.signals import post_migrate
+
+
+class PermissionAppConfig(AppConfig):
+    name = "wbcore.contrib.permission"
+    label = "wbcore_permission"
+
+    def ready(self):
+        from wbcore.contrib.permission.management import refresh_internal_users
+
+        post_migrate.connect(
+            refresh_internal_users,
+            dispatch_uid="permission.refresh_internal_users",
+        )

wbcore/contrib/permission/configurations.py

@@ -0,0 +1,3 @@
+class PermissionConfiguration:
+    GUARDIAN_USER_OBJ_PERMS_MODEL = "wbcore_permission.UserObjectPermission"
+    GUARDIAN_GROUP_OBJ_PERMS_MODEL = "wbcore_permission.GroupObjectPermission"

wbcore/contrib/{guardian → permission}/filters.py

@@ -11,13 +11,13 @@ class ObjectPermissionsFilter(BaseFilterBackend):
     def filter_queryset(self, request, queryset, view):
         from guardian.shortcuts import get_objects_for_user
 
-        from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
+        from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 
         model_class = queryset.model
         if issubclass(model_class, PermissionObjectModelMixin):
             user = request.user
             protected_objects = get_objects_for_user(
-                user, [model_class.view_perm_str], queryset, **model_class.guardian_shortcut_kwargs
+                user, [model_class.view_perm_str], queryset, **model_class.permission_shortcut_kwargs
             )
             public_objects = queryset.filter(permission_type=PermissionObjectModelMixin.PermissionType.PUBLIC)
             return queryset.filter(

wbcore/contrib/permission/internal/registry.py

@@ -0,0 +1,43 @@
+from django.conf import settings
+from django.contrib.auth.models import Group
+from django.db.models import Q, QuerySet
+from django.utils.module_loading import import_string
+
+from wbcore.contrib.authentication.models import User
+
+
+class UserBackendRegistry:
+    def __init__(self):
+        internal_users_backend_path = getattr(
+            settings, "USER_BACKEND", "wbcore.contrib.permission.internal.backend.UserBackend"
+        )
+        internal_users_backend_class = import_string(internal_users_backend_path)
+        self.backend = internal_users_backend_class()
+
+    def get_internal_groups(self) -> QuerySet[Group]:
+        return self.backend.get_internal_groups()
+
+    def get_internal_users(self) -> QuerySet[User]:
+        return User.objects.filter(Q(is_internal=True) | Q(id__in=self.backend.get_internal_users().values("id")))
+
+    def refresh_users(self, reset_all: bool = False):
+        if reset_all:
+            User.objects.filter(is_internal=True).update(is_internal=False)
+        users = []
+        for user in self.get_internal_users().filter(is_active=True):
+            user.is_internal = True
+            users.append(user)
+        User.objects.bulk_update(users, ["is_internal"])
+
+
+def get_internal_groups() -> QuerySet[Group]:
+    """
+    Return the cached groups of internals users
+
+    Returns:
+        A queryset of group corresponding to the internal notion defined by the set UserBackend
+
+    Raises:
+        ValueError: If user backend path does not correspond to a valid module
+    """
+    return UserBackendRegistry().internal_groups

wbcore/contrib/permission/management/__init__.py

@@ -0,0 +1,4 @@
+from wbcore.contrib.permission.internal.registry import UserBackendRegistry
+
+def refresh_internal_users(*args, **kwargs):
+    UserBackendRegistry().refresh_users()

wbcore/contrib/{guardian → permission}/models/mixins.py

@@ -9,12 +9,82 @@ from django.dispatch import receiver
 from django.utils.translation import gettext_lazy as _
 
 from wbcore.contrib.authentication.models.users import User
-from wbcore.contrib.guardian.utils import reload_permissions
-from wbcore.permissions.mixins import PermissionMixin
+from wbcore.contrib.permission.utils import reload_permissions
 from wbcore.utils.itertools import get_inheriting_subclasses
 from wbcore.workers import Queue
 
 
+class PermissionMixin(models.Model):
+    class Meta:
+        abstract = True
+
+    @classmethod
+    @property
+    def view_perm_str(cls) -> str:
+        """
+        Get the view string permission identifer
+
+        Returns:
+            The view string permission identifier
+        """
+        return f"{cls._meta.app_label}.view_{cls._meta.model_name}"
+
+    @classmethod
+    @property
+    def change_perm_str(cls) -> str:
+        """
+        Get the change string permission identifer
+
+        Returns:
+            The change string permission identifier
+        """
+        return f"{cls._meta.app_label}.change_{cls._meta.model_name}"
+
+    @classmethod
+    @property
+    def delete_perm_str(cls) -> str:
+        """
+        Get the delete string permission identifer
+
+        Returns:
+            The delete string permission identifier
+        """
+        return f"{cls._meta.app_label}.delete_{cls._meta.model_name}"
+
+    @classmethod
+    @property
+    def select_perm_str(cls) -> str:
+        """
+        Get the select string permission identifer
+
+        Returns:
+            The select string permission identifier
+        """
+        return f"{cls._meta.app_label}.select_{cls._meta.model_name}"
+
+    @classmethod
+    @property
+    def admin_perm_str(cls) -> str:
+        """
+        Get the admin string permission identifer
+
+        Returns:
+            The admin string permission identifier
+        """
+        return f"{cls._meta.app_label}.administrate_{cls._meta.model_name}"
+
+    @classmethod
+    @property
+    def add_perm_str(cls) -> str:
+        """
+        Get the add string permission identifer
+
+        Returns:
+            The add string permission identifier
+        """
+        return f"{cls._meta.app_label}.add_{cls._meta.model_name}"
+
+
 class PermissionObjectModelMixin(PermissionMixin):
     """
     Permission object Mixin that set the default behavior for permission assignments.
@@ -28,7 +98,7 @@ class PermissionObjectModelMixin(PermissionMixin):
         PUBLIC = "PUBLIC", _("Public")
         PRIVATE = "PRIVATE", _("Private")
 
-    guardian_shortcut_kwargs = {"accept_global_perms": False}
+    permission_shortcut_kwargs = {"accept_global_perms": False}
 
     permission_type = models.CharField(default=PermissionType.PRIVATE, choices=PermissionType.choices, max_length=8)
     creator = models.ForeignKey(

wbcore/{permissions → contrib/permission}/permissions.py

@@ -3,8 +3,6 @@ from rest_framework.permissions import IsAuthenticated
 
 from wbcore.enums import WidgetType
 
-from .shortcuts import is_internal_user
-
 
 class RestAPIModelPermissions(permissions.DjangoModelPermissions):
     """
@@ -42,7 +40,7 @@ class RestAPIModelPermissions(permissions.DjangoModelPermissions):
 
 class IsInternalUser(IsAuthenticated):
     def has_permission(self, request, view) -> bool:
-        return is_internal_user(request.user, True)
+        return request.user.is_internal or request.user.is_superuser
 
 
 class InternalUserPermissionMixin:

wbcore/contrib/{guardian → permission}/tasks.py

@@ -1,6 +1,6 @@
 from celery import shared_task
 
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 from wbcore.utils.itertools import get_inheriting_subclasses
 from wbcore.workers import Queue
 

wbcore/{tests/test_permissions → contrib/permission/tests}/test_backend.py

@@ -2,21 +2,19 @@ import pytest
 from django.contrib.auth.models import Permission
 from django.contrib.contenttypes.models import ContentType
 from faker import Faker
+
 from wbcore.contrib.authentication.models.users import User
-from wbcore.permissions.shortcuts import get_internal_users
+from wbcore.contrib.permission.internal.registry import UserBackendRegistry
 
 fake = Faker()
 
 
 def create_internal_user():
-    from wbcore.permissions.registry import user_registry
-
-    user = User.objects.create(is_active=True, username=fake.user_name(), email=fake.email())
+    user = User.objects.create(is_active=True, username=fake.user_name(), email=fake.email(), is_internal=True)
     permission = Permission.objects.get_or_create(
         content_type=ContentType.objects.get_for_model(User), codename="is_internal_user"
     )[0]
     user.user_permissions.add(permission)
-    user_registry.reset_cache()
     return user
 
 
@@ -24,4 +22,4 @@ def create_internal_user():
 class TestBackend:
     def test_get_internal_users(self):
         user = create_internal_user()
-        assert set(get_internal_users()) == {user}
+        assert set(UserBackendRegistry().get_internal_users()) == {user}

wbcore/contrib/{guardian → permission}/tests/test_model_mixins.py

@@ -1,6 +1,6 @@
 import pytest
 
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 
 
 @pytest.fixture
@@ -21,8 +21,8 @@ def mocked_permission_object_model_mixin(mocker):
 class TestPermissionObjectModelMixin:
     def test_save_run_assign_permissions(self, mocker, mocked_permission_object_model_mixin):
         mocker.patch("django.db.models.Model.save")
-        on_commit = mocker.patch("wbcore.contrib.guardian.models.mixins.transaction.on_commit")
-        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        on_commit = mocker.patch("wbcore.contrib.permission.models.mixins.transaction.on_commit")
+        content_type_class = mocker.patch("wbcore.contrib.permission.models.mixins.ContentType")
         content_type_class.objects.get_for_model.return_value = mocker.Mock()
 
         mocked_permission_object_model_mixin().save()
@@ -30,7 +30,7 @@ class TestPermissionObjectModelMixin:
         on_commit.assert_called_once()
 
     def test_reload_permissions(self, mocker, mocked_permission_object_model_mixin):
-        reload_permissions = mocker.patch("wbcore.contrib.guardian.models.mixins.reload_permissions")
+        reload_permissions = mocker.patch("wbcore.contrib.permission.models.mixins.reload_permissions")
         mocked_permission_object_model_mixin().reload_permissions(prune_existing=True, force_pruning=True)
         reload_permissions.assert_called_once()
 
@@ -79,7 +79,7 @@ class TestPermissionObjectModelMixin:
 
 @pytest.mark.django_db
 def test_post_save_user(user_factory, mocker):
-    on_commit = mocker.patch("wbcore.contrib.guardian.models.mixins.transaction.on_commit")
+    on_commit = mocker.patch("wbcore.contrib.permission.models.mixins.transaction.on_commit")
     user_factory.create()
 
     on_commit.assert_called_once()
@@ -88,6 +88,6 @@ def test_post_save_user(user_factory, mocker):
 @pytest.mark.django_db
 def test_post_save_user_not_called(user_factory, mocker):
     user_factory.create()
-    on_commit = mocker.patch("wbcore.contrib.guardian.models.mixins.transaction.on_commit")
+    on_commit = mocker.patch("wbcore.contrib.permission.models.mixins.transaction.on_commit")
 
     on_commit.assert_not_called()

wbcore/contrib/{guardian → permission}/tests/test_tasks.py

@@ -1,7 +1,7 @@
 import pytest
 from django.contrib.contenttypes.models import ContentType
 
-from wbcore.contrib.guardian.models.mixins import (
+from wbcore.contrib.permission.models.mixins import (
     assign_object_permissions_for_user_as_task,
     assign_user_permissions_for_object_as_task,
 )
@@ -9,7 +9,7 @@ from wbcore.contrib.guardian.models.mixins import (
 
 class TestAssignUserPermissionsForObjectAsTask:
     def test_called(self, mocker):
-        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class = mocker.patch("wbcore.contrib.permission.models.mixins.ContentType")
         content_type = mocker.Mock()
         model_class = mocker.Mock()
         instance = mocker.Mock()
@@ -22,7 +22,7 @@ class TestAssignUserPermissionsForObjectAsTask:
         instance.reload_permissions.assert_called_once_with(prune_existing=True)
 
     def test_called_with_prune_existing(self, mocker):
-        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class = mocker.patch("wbcore.contrib.permission.models.mixins.ContentType")
         content_type = mocker.Mock()
         model_class = mocker.Mock()
         instance = mocker.Mock()
@@ -35,7 +35,7 @@ class TestAssignUserPermissionsForObjectAsTask:
         instance.reload_permissions.assert_called_once_with(prune_existing=False)
 
     def test_not_called_without_model_class(self, mocker):
-        content_type_class = mocker.patch("wbcore.contrib.guardian.models.mixins.ContentType")
+        content_type_class = mocker.patch("wbcore.contrib.permission.models.mixins.ContentType")
         content_type = mocker.Mock()
         model_class = mocker.Mock()
         instance = mocker.Mock()
@@ -64,14 +64,14 @@ class TestAssignUserPermissionsForObjectAsTask:
 
 class TestAssignObjectPermissionsForUserAsTask:
     def test_called(self, mocker):
-        user_class = mocker.patch("wbcore.contrib.guardian.models.mixins.User")
+        user_class = mocker.patch("wbcore.contrib.permission.models.mixins.User")
         user = mocker.Mock()
 
         user_class.objects.get.return_value = user
 
-        get_inheriting_subclasses = mocker.patch("wbcore.contrib.guardian.models.mixins.get_inheriting_subclasses")
+        get_inheriting_subclasses = mocker.patch("wbcore.contrib.permission.models.mixins.get_inheriting_subclasses")
         get_inheriting_subclasses.return_value = [user_class]
-        reload_permissions = mocker.patch("wbcore.contrib.guardian.models.mixins.reload_permissions")
+        reload_permissions = mocker.patch("wbcore.contrib.permission.models.mixins.reload_permissions")
 
         assign_object_permissions_for_user_as_task(user_id=1)
 

wbcore/contrib/{guardian → permission}/tests/test_utils.py

@@ -2,9 +2,9 @@ import pytest
 from django.contrib.contenttypes.models import ContentType
 
 from wbcore.contrib.authentication.models.users import Permission
-from wbcore.contrib.guardian.models import UserObjectPermission
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
-from wbcore.contrib.guardian.utils import (
+from wbcore.contrib.permission.models import UserObjectPermission
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
+from wbcore.contrib.permission.utils import (
     assign_permissions,
     get_permission_matrix,
     get_public_user_or_group,
@@ -42,7 +42,7 @@ class TestAssignPermissionsMap:
         ).editable
 
     def test_assign_permission_with_non_perm(self, mocker):
-        assign_perm = mocker.patch("wbcore.contrib.guardian.utils.assign_perm")
+        assign_perm = mocker.patch("wbcore.contrib.permission.utils.assign_perm")
         assign_perm.return_value = None
 
         assign_permissions([("view_user", mocker.Mock(), mocker.Mock(), True)])
@@ -163,8 +163,8 @@ class TestPrunePermissions:
 
 class TestReloadPermissions:
     def test_reload_permissions(self, mocker):
-        get_permission_matrix = mocker.patch("wbcore.contrib.guardian.utils.get_permission_matrix")
-        assign_permissions = mocker.patch("wbcore.contrib.guardian.utils.assign_permissions")
+        get_permission_matrix = mocker.patch("wbcore.contrib.permission.utils.get_permission_matrix")
+        assign_permissions = mocker.patch("wbcore.contrib.permission.utils.assign_permissions")
 
         queryset = mocker.Mock()
 
@@ -174,9 +174,9 @@ class TestReloadPermissions:
         assign_permissions.assert_called_once()
 
     def test_reload_permissions_with_prune(self, mocker):
-        prune_permissions = mocker.patch("wbcore.contrib.guardian.utils.prune_permissions")
-        mocker.patch("wbcore.contrib.guardian.utils.get_permission_matrix")
-        mocker.patch("wbcore.contrib.guardian.utils.assign_permissions")
+        prune_permissions = mocker.patch("wbcore.contrib.permission.utils.prune_permissions")
+        mocker.patch("wbcore.contrib.permission.utils.get_permission_matrix")
+        mocker.patch("wbcore.contrib.permission.utils.assign_permissions")
 
         queryset = mocker.Mock()
 
@@ -185,9 +185,9 @@ class TestReloadPermissions:
         prune_permissions.assert_not_called()
 
     def test_reload_permissions_with_prune_and_instance(self, mocker):
-        prune_permissions = mocker.patch("wbcore.contrib.guardian.utils.prune_permissions")
-        mocker.patch("wbcore.contrib.guardian.utils.get_permission_matrix")
-        mocker.patch("wbcore.contrib.guardian.utils.assign_permissions")
+        prune_permissions = mocker.patch("wbcore.contrib.permission.utils.prune_permissions")
+        mocker.patch("wbcore.contrib.permission.utils.get_permission_matrix")
+        mocker.patch("wbcore.contrib.permission.utils.assign_permissions")
 
         queryset = mocker.Mock()
         instance = mocker.Mock()

wbcore/contrib/{guardian → permission}/tests/test_viewsets.py

@@ -4,12 +4,12 @@ from django.db.models import Q
 from guardian.shortcuts import assign_perm
 
 from wbcore.contrib.authentication.models.users import Permission
-from wbcore.contrib.guardian.viewsets import PivotUserObjectPermissionModelViewSet
+from wbcore.contrib.permission.viewsets import PivotUserObjectPermissionModelViewSet
 
 
 class TestPivotUserObjectPermissionModelViewSet:
     def test_cached_property_permissions(self, mocker, request):
-        mocked_filter = mocker.patch("wbcore.contrib.guardian.viewsets.viewsets.Permission.objects.filter")
+        mocked_filter = mocker.patch("wbcore.contrib.permission.viewsets.viewsets.Permission.objects.filter")
         view = PivotUserObjectPermissionModelViewSet(request=request, kwargs={"content_type_id": 1})
         assert view.permissions
 
@@ -21,7 +21,7 @@ class TestPivotUserObjectPermissionModelViewSet:
         )
 
     def test_linked_object(self, mocker, request):
-        mocked_contrib_type = mocker.patch("wbcore.contrib.guardian.viewsets.viewsets.ContentType.objects")
+        mocked_contrib_type = mocker.patch("wbcore.contrib.permission.viewsets.viewsets.ContentType.objects")
         mocked_get_object_for_this_type = mocker.Mock()
         mocked_contrib_type.get.return_value = mocked_get_object_for_this_type
         view = PivotUserObjectPermissionModelViewSet(request=request, kwargs={"content_type_id": 1, "object_pk": 1})

wbcore/contrib/{guardian → permission}/urls.py

@@ -1,6 +1,6 @@
 from django.urls import include, path
 
-from wbcore.contrib.guardian.viewsets import PivotUserObjectPermissionModelViewSet
+from wbcore.contrib.permission.viewsets import PivotUserObjectPermissionModelViewSet
 from wbcore.routers import WBCoreRouter
 
 router = WBCoreRouter()

wbcore/contrib/{guardian → permission}/utils.py

@@ -10,11 +10,37 @@ from guardian.shortcuts import assign_perm, get_anonymous_user
 from psycopg.errors import InvalidCursorName
 
 from wbcore.contrib.authentication.models import User
-from wbcore.contrib.guardian.models import UserObjectPermission
-from wbcore.permissions.shortcuts import get_internal_users
+from wbcore.contrib.permission.models import UserObjectPermission
 
 if TYPE_CHECKING:
-    from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
+    from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
+
+from django.contrib.auth.models import Permission
+
+
+def perm_to_permission(perm: str) -> Permission:
+    """
+    Convert a identifier string permission format in 'app_label.codename'
+    (teremd as *perm*) to a django permission instance.
+
+    Args:
+        perm: The string permission identifier in the form 'app_label.codename'
+
+    Returns:
+        The Permission object corresponding to the given string identifier
+
+    Raises:
+        AttributeError: When the given string identifier does not match the expected format 'app_label.codename'
+    """
+    try:
+        app_label, codename = perm.split(".", 1)
+    except IndexError as e:
+        raise AttributeError(
+            "The format of identifier string permission (perm) is wrong. It should be in 'app_label.codename'."
+        ) from e
+    else:
+        permission = Permission.objects.get(content_type__app_label=app_label, codename=codename)
+        return permission
 
 
 def assign_permissions(permissions_map: Iterable[tuple[str, Model, User, bool]]):
@@ -51,7 +77,9 @@ def get_public_user_or_group(only_internal: bool = False) -> QuerySet[User]:
     users = User.objects.filter(is_active=True)
     if only_internal:
         users = users.filter(
-            Q(is_superuser=True) | Q(id=get_anonymous_user().pk) | Q(id__in=get_internal_users().values("id"))
+            Q(is_superuser=True)
+            | Q(id=get_anonymous_user().pk)
+            | Q(id__in=User.objects.filter_internal().values("id"))
         )
     return users
 

wbcore/contrib/{guardian → permission}/viewsets/configs/buttons.py

@@ -3,8 +3,8 @@ from contextlib import suppress
 from django.dispatch import receiver
 from rest_framework.reverse import reverse
 
-from wbcore.contrib.guardian.models.mixins import PermissionObjectModelMixin
 from wbcore.contrib.icons.icons import WBIcon
+from wbcore.contrib.permission.models.mixins import PermissionObjectModelMixin
 from wbcore.metadata.configs.buttons import ButtonViewConfig
 from wbcore.metadata.configs.buttons.buttons import WidgetButton
 from wbcore.metadata.configs.buttons.enums import Button
@@ -30,7 +30,7 @@ def add_object_permission_button(sender, instance, request, view, pk=None, **kwa
             and pk is not None
         ):
             endpoint = reverse(
-                "wbcore:guardian:pivoteduserobjectpermission-list",
+                "wbcore:permission:pivoteduserobjectpermission-list",
                 args=[view.get_content_type().id, pk],
                 request=request,
             )

wbcore/contrib/{guardian → permission}/viewsets/configs/displays.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 from wbcore.metadata.configs import display as dp
 
 if TYPE_CHECKING:
-    from wbcore.contrib.guardian.viewsets import PivotUserObjectPermissionModelViewSet
+    from wbcore.contrib.permission.viewsets import PivotUserObjectPermissionModelViewSet
 
 
 class PivotUserObjectPermissionDisplayViewConfig(dp.DisplayViewConfig):

wbcore/contrib/{guardian → permission}/viewsets/configs/endpoints.py

@@ -6,21 +6,21 @@ from wbcore.metadata.configs.endpoints import EndpointViewConfig
 class PivotUserObjectPermissionEndpointViewConfig(EndpointViewConfig):
     def get_instance_endpoint(self, **kwargs):
         return reverse(
-            "wbcore:guardian:pivoteduserobjectpermission-list",
+            "wbcore:permission:pivoteduserobjectpermission-list",
             args=[self.view.kwargs.get("content_type_id", None), self.view.kwargs.get("object_pk", None)],
             request=self.request,
         )
 
     def get_update_endpoint(self, **kwargs):
         return reverse(
-            "wbcore:guardian:pivoteduserobjectpermission-list",
+            "wbcore:permission:pivoteduserobjectpermission-list",
             args=[self.view.kwargs.get("content_type_id", None), self.view.kwargs.get("object_pk", None)],
             request=self.request,
         )
 
     def get_create_endpoint(self, **kwargs):
         return reverse(
-            "wbcore:guardian:pivoteduserobjectpermission-list",
+            "wbcore:permission:pivoteduserobjectpermission-list",
             args=[self.view.kwargs.get("content_type_id", None), self.view.kwargs.get("object_pk", None)],
             request=self.request,
         )

wbcore/contrib/{guardian → permission}/viewsets/configs/titles.py

@@ -3,7 +3,7 @@ from typing import TYPE_CHECKING
 from wbcore.metadata.configs.titles import TitleViewConfig
 
 if TYPE_CHECKING:
-    from wbcore.contrib.guardian.viewsets import PivotUserObjectPermissionModelViewSet
+    from wbcore.contrib.permission.viewsets import PivotUserObjectPermissionModelViewSet
 
 
 class PivotUserObjectPermissionTitleViewConfig(TitleViewConfig):

wbcore/contrib/{guardian → permission}/viewsets/mixins.py

@@ -1,6 +1,6 @@
-from wbcore.contrib.guardian.filters import ObjectPermissionsFilter
+from wbcore.contrib.permission.filters import ObjectPermissionsFilter
 from wbcore.viewsets.mixins import FilterMixin
 
 
-class GuardianFilterMixin(FilterMixin):
+class ObjectPermissionFilterMixin(FilterMixin):
     filter_backends = (ObjectPermissionsFilter, *FilterMixin.filter_backends)

wbcore/contrib/{guardian → permission}/viewsets/viewsets.py

@@ -7,8 +7,8 @@ from rest_framework.exceptions import ValidationError
 from wbcore import serializers, viewsets
 from wbcore.contrib.authentication.models.users import Permission, User
 from wbcore.contrib.authentication.serializers import UserRepresentationSerializer
-from wbcore.contrib.guardian.models import UserObjectPermission
-from wbcore.contrib.guardian.viewsets.configs import (
+from wbcore.contrib.permission.models import UserObjectPermission
+from wbcore.contrib.permission.viewsets.configs import (
     PivotUserObjectPermissionButtonViewConfig,
     PivotUserObjectPermissionDisplayViewConfig,
     PivotUserObjectPermissionEndpointViewConfig,

wbcore/contrib/workflow/viewsets/menu/condition.py

@@ -1,19 +1,18 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 CONDITION_MENUITEM = MenuItem(
     label=_("Condition"),
     endpoint="wbcore:workflow:condition-list",
     permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_condition"]
+        method=lambda request: request.user.is_internal, permissions=["workflow.view_condition"]
     ),
     add=MenuItem(
         label=_("Create Condition"),
         endpoint="wbcore:workflow:condition-list",
         permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_condition"]
+            method=lambda request: request.user.is_internal, permissions=["workflow.add_condition"]
         ),
     ),
 )

wbcore/contrib/workflow/viewsets/menu/data.py

@@ -1,19 +1,14 @@
 from django.utils.translation import gettext as _
 
 from wbcore.menus import ItemPermission, MenuItem
-from wbcore.permissions.shortcuts import is_internal_user
 
 DATA_MENUITEM = MenuItem(
     label=_("Data"),
     endpoint="wbcore:workflow:data-list",
-    permission=ItemPermission(
-        method=lambda request: is_internal_user(request.user), permissions=["workflow.view_data"]
-    ),
+    permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.view_data"]),
     add=MenuItem(
         label=_("Create Data"),
         endpoint="wbcore:workflow:data-list",
-        permission=ItemPermission(
-            method=lambda request: is_internal_user(request.user), permissions=["workflow.add_data"]
-        ),
+        permission=ItemPermission(method=lambda request: request.user.is_internal, permissions=["workflow.add_data"]),
     ),
 )