modoboa 2.6.3__py3-none-any.whl → 2.6.5__py3-none-any.whl

modoboa/sievefilters/api/v2/tests.py

@@ -96,6 +96,12 @@ class FilterSetViewSetTestCase(PatcherMixin, ModoAPITestCase):
         resp = self.client.post(url)
         self.assertEqual(resp.status_code, 200)
 
+    def test_deactivate_active(self):
+        self.authenticate()
+        url = reverse("v2:filterset-deactivate-active")
+        resp = self.client.post(url)
+        self.assertEqual(resp.status_code, 200)
+
     def test_download(self):
         self.authenticate()
         url = reverse("v2:filterset-download", args=["unknown"])

modoboa/sievefilters/api/v2/viewsets.py

@@ -99,6 +99,16 @@ class FilterSetViewSet(viewsets.ViewSet):
             return response.Response({"error": str(err)}, status=400)
         return response.Response()
 
+    @action(methods=["post"], detail=False)
+    def deactivate_active(self, request):
+        """Deactivate the current active filterset."""
+        sclient = self.get_sieve_client(request)
+        try:
+            sclient.activatescript("")
+        except SieveClientError as err:
+            return response.Response({"error": str(err)}, status=400)
+        return response.Response()
+
     @action(methods=["get"], detail=True)
     def download(self, request, pk):
         """Download the content of an existing filter set."""

modoboa/webmail/serializers.py

@@ -173,7 +173,8 @@ class EmailSerializer(serializers.Serializer):
 
 class MoveSelectionSerializer(serializers.Serializer):
 
-    mailbox = serializers.CharField()
+    source = serializers.CharField()
+    destination = serializers.CharField(required=False)
     selection = serializers.ListField(child=serializers.CharField())
 
     def validate_selection(self, value):

modoboa/webmail/tests/test_viewsets.py

@@ -173,15 +173,27 @@ class UserEmailViewSetTestCase(WebmailTestCase):
         self.assertEqual(response.status_code, 200)
         self.assertIn("Message-ID", response.json()["source"])
 
+    def test_move(self):
+        self.authenticate()
+        url = reverse("v2:webmail-email-move")
+        body = {"source": "INBOX", "destination": "Junk", "selection": [1]}
+        response = self.client.post(url, body, format="json")
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response.json()["count"], 1)
+
+        body = {"source": "INBOX", "selection": [1]}
+        response = self.client.post(url, body, format="json")
+        self.assertEqual(response.status_code, 400)
+
     def test_delete(self):
         self.authenticate()
         url = reverse("v2:webmail-email-delete")
-        body = {"mailbox": "INBOX", "selection": [1]}
+        body = {"source": "INBOX", "selection": [1]}
         response = self.client.post(url, body, format="json")
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json()["count"], 1)
 
-        body = {"mailbox": "INBOX", "selection": ["truc"]}
+        body = {"source": "INBOX", "selection": ["truc"]}
         response = self.client.post(url, body, format="json")
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json()["count"], 0)
@@ -189,7 +201,7 @@ class UserEmailViewSetTestCase(WebmailTestCase):
     def test_mark_as_junk(self):
         self.authenticate()
         url = reverse("v2:webmail-email-mark-as-junk")
-        body = {"mailbox": "INBOX", "selection": [1]}
+        body = {"source": "INBOX", "selection": [1]}
         response = self.client.post(url, body, format="json")
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json()["count"], 1)
@@ -197,7 +209,7 @@ class UserEmailViewSetTestCase(WebmailTestCase):
     def test_mark_as_not_junk(self):
         self.authenticate()
         url = reverse("v2:webmail-email-mark-as-not-junk")
-        body = {"mailbox": "INBOX", "selection": [1]}
+        body = {"source": "INBOX", "selection": [1]}
         response = self.client.post(url, body, format="json")
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.json()["count"], 1)

modoboa/webmail/viewsets.py

@@ -9,6 +9,7 @@ from rest_framework import parsers, response, viewsets
 from rest_framework.decorators import action
 from rest_framework.permissions import IsAuthenticated
 
+from modoboa.lib import exceptions
 from modoboa.lib.paginator import Paginator
 from modoboa.lib.viewsets import HasMailbox
 from modoboa.webmail import lib, serializers
@@ -123,7 +124,7 @@ class UserEmailViewSet(viewsets.GenericViewSet):
     def get_serializer_class(self):
         if self.action == "list":
             return serializers.PaginatedEmailListSerializer
-        if self.action in ["delete", "mark_as_junk", "mark_as_not_junk"]:
+        if self.action in ["move", "delete", "mark_as_junk", "mark_as_not_junk"]:
             return serializers.MoveSelectionSerializer
         if self.action == "flag":
             return serializers.FlagSelectionSerializer
@@ -167,18 +168,31 @@ class UserEmailViewSet(viewsets.GenericViewSet):
         )
         return response.Response(serializer.data)
 
-    def move_selection(self, request, destination: str) -> int:
+    def move_selection(self, request, destination: str | None = None) -> int:
         """Move selected messages to the given mailbox."""
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
+        if destination is None:
+            if "destination" not in serializer.validated_data:
+                raise exceptions.BadRequest("No destination provided")
+            destination = serializer.validated_data["destination"]
         with lib.get_imapconnector(request) as mbc:
             mbc.move(
                 ",".join(serializer.validated_data["selection"]),
-                serializer.validated_data["mailbox"],
+                serializer.validated_data["source"],
                 destination,
             )
         return len(serializer.validated_data["selection"])
 
+    @action(
+        methods=["post"],
+        detail=False,
+        serializer_class=serializers.MoveSelectionSerializer,
+    )
+    def move(self, request):
+        count = self.move_selection(request)
+        return response.Response({"count": count})
+
     @action(
         methods=["post"],
         detail=False,

{modoboa-2.6.3.dist-info → modoboa-2.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modoboa
-Version: 2.6.3
+Version: 2.6.5
 Summary: Mail hosting made simple
 Author-email: Antoine Nguyen <tonio@ngyn.org>
 License: ISC License
@@ -41,7 +41,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: django==5.2.8
-Requires-Dist: django-phonenumber-field[phonenumbers]==8.3.0
+Requires-Dist: django-phonenumber-field[phonenumbers]==8.4.0
 Requires-Dist: django-reversion==6.0.0
 Requires-Dist: django-xforwardedfor-middleware==2.0
 Requires-Dist: django-otp==1.6.3