New fixes

This commit is contained in:
Antoine Nguyen
2025-02-18 16:15:44 +01:00
parent db0b7eb79d
commit 4458e82c25
92 changed files with 298 additions and 309 deletions
+11 -7
View File
@@ -178,7 +178,7 @@ class DomainAliasSerializer(serializers.ModelSerializer):
object_type="domain_aliases",
)
except lib_exceptions.ModoboaException as inst:
raise serializers.ValidationError({"domain": force_str(inst)})
raise serializers.ValidationError({"domain": force_str(inst)}) from None
domain_alias.save(creator=creator)
return domain_alias
@@ -311,7 +311,7 @@ class AccountPasswordSerializer(serializers.ModelSerializer):
try:
password_validation.validate_password(value, self.instance)
except ValidationError as exc:
raise serializers.ValidationError(exc.messages[0])
raise serializers.ValidationError(exc.messages[0]) from None
return value
def update(self, instance, validated_data):
@@ -363,7 +363,7 @@ class WritableAccountSerializer(AccountSerializer):
try:
validators.UTF8EmailValidator()(username)
except ValidationError as err:
raise ValidationError({"username": err.message})
raise ValidationError({"username": err.message}) from None
mailbox = data.get("mailbox")
if mailbox is None:
if not self.instance:
@@ -396,7 +396,9 @@ class WritableAccountSerializer(AccountSerializer):
object_type="mailboxes",
)
except lib_exceptions.ModoboaException as inst:
raise serializers.ValidationError({"mailbox": force_str(inst)})
raise serializers.ValidationError(
{"mailbox": force_str(inst)}
) from None
condition = not data.get("random_password") and (
data.get("password") or not self.partial
)
@@ -408,7 +410,9 @@ class WritableAccountSerializer(AccountSerializer):
data["password"], self.instance
)
except ValidationError as exc:
raise serializers.ValidationError({"password": exc.messages[0]})
raise serializers.ValidationError(
{"password": exc.messages[0]}
) from None
elif not self.instance:
raise serializers.ValidationError(
{"password": _("This field is required.")}
@@ -523,9 +527,9 @@ class AliasSerializer(serializers.ModelSerializer):
value, self.context["request"].user, instance=self.instance
)
except ValidationError as err:
raise serializers.ValidationError(err)
raise serializers.ValidationError(err) from None
except AliasExists:
raise serializers.ValidationError(_("This alias already exists"))
raise serializers.ValidationError(_("This alias already exists")) from None
return value.lower()
def create(self, validated_data):
+1 -1
View File
@@ -135,7 +135,7 @@ class AccountViewSet(
try:
user = core_models.User.objects.get(pk=pk)
except core_models.User.DoesNotExist:
raise http.Http404
raise http.Http404 from None
serializer = self.get_serializer(user, data=request.data)
if serializer.is_valid():
serializer.save()
+7 -5
View File
@@ -94,7 +94,7 @@ class DomainSerializer(v1_serializers.DomainSerializer):
return domain
# 1. Create a domain administrator
username = "%s@%s" % (domain_admin["username"], domain.name)
username = "{}@{}".format(domain_admin["username"], domain.name)
try:
da = core_models.User.objects.get(username=username)
except core_models.User.DoesNotExist:
@@ -244,7 +244,7 @@ class AdminGlobalParametersSerializer(serializers.Serializer):
except ValueError:
raise serializers.ValidationError(
_("This field only allows valid IP addresses (or networks)")
)
) from None
return value
def validate_auto_create_domain_and_mailbox(self, value):
@@ -479,7 +479,7 @@ class WritableAccountSerializer(v1_serializers.WritableAccountSerializer):
try:
validators.UTF8EmailValidator()(username)
except ValidationError as err:
raise ValidationError({"username": err.message})
raise ValidationError({"username": err.message}) from None
mailbox = data.get("mailbox")
if mailbox is None:
if not self.instance:
@@ -501,7 +501,7 @@ class WritableAccountSerializer(v1_serializers.WritableAccountSerializer):
object_type="mailboxes",
)
except lib_exceptions.ModoboaException as inst:
raise serializers.ValidationError({"mailbox": str(inst)})
raise serializers.ValidationError({"mailbox": str(inst)}) from None
if len(self.address) > 64:
raise serializers.ValidationError(
{
@@ -518,7 +518,9 @@ class WritableAccountSerializer(v1_serializers.WritableAccountSerializer):
data["password"], self.instance
)
except ValidationError as exc:
raise serializers.ValidationError({"password": exc.messages[0]})
raise serializers.ValidationError(
{"password": exc.messages[0]}
) from None
elif not self.instance:
raise serializers.ValidationError(
{"password": _("This field is required.")}