From 6390ad98c1da641bc0d7e5900523e4de3d7abad6 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Wed, 15 Oct 2025 11:49:04 +0200
Subject: [PATCH] Split identities export by type

Different exports for account and alias types.
---
 frontend/src/api/identities.js                   |  4 ++--
 .../components/admin/identities/IdentityList.vue |  1 +
 .../views/admin/identities/IdentitiesView.vue    |  6 +++---
 modoboa/admin/api/v2/tests.py                    | 16 ++++++++++++++++
 modoboa/admin/api/v2/viewsets.py                 |  3 ++-
 modoboa/admin/lib.py                             |  7 ++++++-
 6 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/frontend/src/api/identities.js b/frontend/src/api/identities.js
index b907cfed8..9a4af54d0 100644
--- a/frontend/src/api/identities.js
+++ b/frontend/src/api/identities.js
@@ -6,8 +6,8 @@ export default {
   getAll() {
     return repository.get(`${resource}/`)
   },
-  exportAll() {
-    return repository.get(`/${resource}/export/`)
+  exportAll(type) {
+    return repository.get(`/${resource}/export/`, { params: { type } })
   },
   importFromCSV(data) {
     return repository.post(`/${resource}/import/`, data, {
diff --git a/frontend/src/components/admin/identities/IdentityList.vue b/frontend/src/components/admin/identities/IdentityList.vue
index bdff42482..b9c89331e 100644
--- a/frontend/src/components/admin/identities/IdentityList.vue
+++ b/frontend/src/components/admin/identities/IdentityList.vue
@@ -551,6 +551,7 @@ onMounted(() => {
 
 defineExpose({
   fetchIdentities,
+  identityType,
 })
 
 fetchIdentities = debounce(fetchIdentities, 500)
diff --git a/frontend/src/views/admin/identities/IdentitiesView.vue b/frontend/src/views/admin/identities/IdentitiesView.vue
index 9bfaca4e9..2395a3447 100644
--- a/frontend/src/views/admin/identities/IdentitiesView.vue
+++ b/frontend/src/views/admin/identities/IdentitiesView.vue
@@ -104,7 +104,7 @@
   </div>
 </template>
 
-<script setup lang="js">
+<script setup>
 import { ref } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import identitiesApi from '@/api/identities'
@@ -124,8 +124,8 @@ const importForm = ref()
 const idList = ref()
 
 function exportIdentities() {
-  identitiesApi.exportAll().then((resp) => {
-    exportContent(resp.data, 'identities', $gettext)
+  identitiesApi.exportAll(idList.value.identityType).then((resp) => {
+    exportContent(resp.data, `${idList.value.identityType}-list`, $gettext)
   })
 }
 
diff --git a/modoboa/admin/api/v2/tests.py b/modoboa/admin/api/v2/tests.py
index c76858f50..3cfdb869d 100644
--- a/modoboa/admin/api/v2/tests.py
+++ b/modoboa/admin/api/v2/tests.py
@@ -653,6 +653,22 @@ dlist; dlist@test.com; True; user1@test.com; user@extdomain.com
         received_content[0] = ",".join(admin_row)
         self.assertCountEqual(expected_response.strip().split("\r\n"), received_content)
 
+    def test_export_accounts(self):
+        response = self.client.get(f"{reverse('v2:identities-export')}?type=account")
+        expected_response = "account,admin,,,,True,SuperAdmins,,\r\naccount,admin@test.com,{PLAIN}toto,,,True,DomainAdmins,admin@test.com,10,test.com\r\naccount,admin@test2.com,{PLAIN}toto,,,True,DomainAdmins,admin@test2.com,10,test2.com\r\naccount,user@test.com,{PLAIN}toto,,,True,SimpleUsers,user@test.com,10\r\naccount,user@test2.com,{PLAIN}toto,,,True,SimpleUsers,user@test2.com,10\r\n"  # NOQA:E501
+        received_content = force_str(response.content.strip()).split("\r\n")
+        # Empty admin password because it is hashed using SHA512-CRYPT
+        admin_row = received_content[0].split(",")
+        admin_row[2] = ""
+        received_content[0] = ",".join(admin_row)
+        self.assertCountEqual(expected_response.strip().split("\r\n"), received_content)
+
+    def test_export_aliases(self):
+        response = self.client.get(f"{reverse('v2:identities-export')}?type=alias")
+        expected_response = "alias,alias@test.com,True,user@test.com\r\nalias,forward@test.com,True,user@external.com\r\nalias,postmaster@test.com,True,test@truc.fr,toto@titi.com\r\n"  # NOQA:E501
+        received_content = force_str(response.content.strip()).split("\r\n")
+        self.assertCountEqual(expected_response.strip().split("\r\n"), received_content)
+
 
 class AliasViewSetTestCase(ModoAPITestCase):
     @classmethod
diff --git a/modoboa/admin/api/v2/viewsets.py b/modoboa/admin/api/v2/viewsets.py
index e75d137c4..3ce71c635 100644
--- a/modoboa/admin/api/v2/viewsets.py
+++ b/modoboa/admin/api/v2/viewsets.py
@@ -240,7 +240,8 @@ class IdentityViewSet(GetThrottleViewsetMixin, viewsets.ViewSet):
     def export(self, request, **kwargs):
         """Export accounts and aliases to CSV."""
         result = []
-        for idt in lib.get_identities(request.user):
+        idtfilter = request.GET.get("type")
+        for idt in lib.get_identities(request.user, idtfilter=idtfilter):
             result.append(idt.to_csv_row())
         return response.Response(result)
 
diff --git a/modoboa/admin/lib.py b/modoboa/admin/lib.py
index 72c611895..69b6a0943 100644
--- a/modoboa/admin/lib.py
+++ b/modoboa/admin/lib.py
@@ -31,7 +31,12 @@ from . import signals
 from .models import Alias, Domain, DomainAlias
 
 
-def get_identities(user, searchquery=None, idtfilter=None, grpfilter=None):
+def get_identities(
+    user: User,
+    searchquery: str | None = None,
+    idtfilter: str | None = None,
+    grpfilter: str | None = None,
+) -> chain:
     """Return all the identities owned by a user.
 
     :param user: the desired user