[refactor] Use FilterByParent mixin in BaseEmailView #354

Refactored BaseEmailView to inherit from FilterByParent mixin.

Fixes #354

Author: dee077

openwisp_users/api/mixins.py

@@ -107,8 +107,6 @@ def get_queryset(self):
 
     def assert_parent_exists(self):
         parent_queryset = self.get_parent_queryset()
-        if not self.request.user.is_superuser:
-            parent_queryset = self.get_organization_queryset(parent_queryset)
         try:
             assert parent_queryset.exists()
         except (AssertionError, ValidationError):

openwisp_users/api/views.py

@@ -20,7 +20,7 @@
 
 from openwisp_users.api.permissions import DjangoModelPermissions
 
-from .mixins import ProtectedAPIMixin as BaseProtectedAPIMixin
+from .mixins import ProtectedAPIMixin as BaseProtectedAPIMixin, FilterByParentOwned
 from .serializers import (
     ChangePasswordSerializer,
     EmailAddressSerializer,
@@ -198,7 +198,7 @@ def update(self, request, *args, **kwargs):
         )
 
 
-class BaseEmailView(ProtectedAPIMixin, GenericAPIView):
+class BaseEmailView(ProtectedAPIMixin, FilterByParentOwned, GenericAPIView):
     model = EmailAddress
     serializer_class = EmailAddressSerializer
 
@@ -209,13 +209,6 @@ def initial(self, *args, **kwargs):
         super().initial(*args, **kwargs)
         self.assert_parent_exists()
 
-    def assert_parent_exists(self):
-        try:
-            assert self.get_parent_queryset().exists()
-        except (AssertionError, ValidationError):
-            user_id = self.kwargs['pk']
-            raise NotFound(detail=_("User with ID '{}' not found.".format(user_id)))
-
     def get_parent_queryset(self):
         user = self.request.user