github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3691 from modoboa/fix/csv_import_crypt_passwords

Browse Source 
Fixed naming inconsistency between frontend and API.
This commit is contained in:
Antoine Nguyen
2025-08-22 10:15:13 +02:00
committed by GitHub
parent acd93fe647 29287d5878
commit 076eac152a
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/admin/api/v2/serializers.py
+1 -1
View File
@@ -731,7 +731,7 @@ class CSVImportSerializer(serializers.Serializer):
class CSVIdentityImportSerializer(CSVImportSerializer):
"""Custom serializer for identity import."""
crypt_password = serializers.BooleanField()
crypt_passwords = serializers.BooleanField()
class AlarmSerializer(serializers.ModelSerializer):
modoboa/admin/api/v2/tests.py
+1 -1
View File
@@ -593,7 +593,7 @@ dlist; dlist@test.com; True; user1@test.com; user@extdomain.com
) # NOQA:E501
self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True},
{"sourcefile": f, "crypt_passwords": True},
)
admin = core_models.User.objects.get(username="admin")
u1 = core_models.User.objects.get(username="user1@test.com")
modoboa/admin/lib.py
+1 -1
View File
@@ -138,7 +138,7 @@ def import_domainalias(user, row, formopts):
def import_account(user, row, formopts):
"""Specific code for accounts import"""
account = User()
account.from_csv(user, row, formopts["crypt_password"])
account.from_csv(user, row, formopts["crypt_passwords"])
def _import_alias(user, row, **kwargs):
modoboa/admin/tests/test_import_.py
+11 -11
View File
@@ -88,7 +88,7 @@ account; user1@nonlocal.com; toto; User; One; True; SimpleUsers; user1@nonlocal.
name="identities.csv",
) # NOQA:E501
url = reverse("v2:identities-import-from-csv")
self.client.post(url, {"sourcefile": f, "crypt_password": True})
self.client.post(url, {"sourcefile": f, "crypt_passwords": True})
self.assertFalse(User.objects.filter(username="user1@nonlocal.com").exists())
def test_import_invalid_quota(self):
@@ -99,7 +99,7 @@ account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com; ; t
name="identities.csv",
) # NOQA:E501
url = reverse("v2:identities-import-from-csv")
resp = self.client.post(url, {"sourcefile": f, "crypt_password": True})
resp = self.client.post(url, {"sourcefile": f, "crypt_passwords": True})
self.assertIn("wrong quota value", resp.content.decode())
def test_import_domain_by_domainadmin(self):
@@ -114,7 +114,7 @@ domain; domain2.com; 1000; 200; False
name="identities.csv",
)
url = reverse("v2:identities-import-from-csv")
resp = self.client.post(url, {"sourcefile": f, "crypt_password": True})
resp = self.client.post(url, {"sourcefile": f, "crypt_passwords": True})
self.assertIn("You are not allowed to import domains", resp.content.decode())
f = ContentFile(
b"""
@@ -122,7 +122,7 @@ domainalias; domalias1.com; test.com; True
""",
name="identities.csv",
)
resp = self.client.post(url, {"sourcefile": f, "crypt_password": True})
resp = self.client.post(url, {"sourcefile": f, "crypt_passwords": True})
self.assertIn(
"You are not allowed to import domain aliases", resp.content.decode()
)
@@ -138,7 +138,7 @@ account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com; 40
)
resp = self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True},
{"sourcefile": f, "crypt_passwords": True},
)
self.assertIn("test.com: domain quota exceeded", resp.content.decode())
@@ -151,7 +151,7 @@ account; user1@test.com; toto; User; One; True; SimpleUsers; user1@test.com
)
self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True},
{"sourcefile": f, "crypt_passwords": True},
)
account = User.objects.get(username="user1@test.com")
self.assertEqual(
@@ -168,7 +168,7 @@ account; truc@test.com; toto; René; Truc; True; DomainAdmins; truc@test.com; 0;
) # NOQA:E501
self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True, "continue_if_exists": True},
{"sourcefile": f, "crypt_passwords": True, "continue_if_exists": True},
)
admin = User.objects.get(username="admin")
u1 = User.objects.get(username="truc@test.com")
@@ -189,7 +189,7 @@ account; sa@test.com; toto; Super; Admin; True; SuperAdmins; superadmin@test.com
) # NOQA:E501
self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True, "continue_if_exists": True},
{"sourcefile": f, "crypt_passwords": True, "continue_if_exists": True},
)
with self.assertRaises(User.DoesNotExist):
User.objects.get(username="sa@test.com")
@@ -203,7 +203,7 @@ alias;user.alias@test.com;True;user@test.com;;;;;;;;;;;;;;;;
)
self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True, "continue_if_exists": True},
{"sourcefile": f, "crypt_passwords": True, "continue_if_exists": True},
)
alias = Alias.objects.get(address="user.alias@test.com")
self.assertEqual(alias.type, "alias")
@@ -218,7 +218,7 @@ alias;user@test.com;True;admin@test.com
)
self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True},
{"sourcefile": f, "crypt_passwords": True},
)
self.assertTrue(
Alias.objects.filter(address="user@test.com", internal=False).exists()
@@ -315,7 +315,7 @@ alias; alias1@test.com; True; user1@test.com
) # NOQA:E501
resp = self.client.post(
reverse("v2:identities-import-from-csv"),
{"sourcefile": f, "crypt_password": True},
{"sourcefile": f, "crypt_passwords": True},
)
self.assertEqual(resp.status_code, 200)