replaced MX email validator with email format only
This commit is contained in:
parent
07ac5bf6a2
commit
06a7f1af05
|
@ -301,7 +301,7 @@ func (c MetaConfig) Validate() error {
|
||||||
validation.Field(&c.AppName, validation.Required, validation.Length(1, 255)),
|
validation.Field(&c.AppName, validation.Required, validation.Length(1, 255)),
|
||||||
validation.Field(&c.AppUrl, validation.Required, is.URL),
|
validation.Field(&c.AppUrl, validation.Required, is.URL),
|
||||||
validation.Field(&c.SenderName, validation.Required, validation.Length(1, 255)),
|
validation.Field(&c.SenderName, validation.Required, validation.Length(1, 255)),
|
||||||
validation.Field(&c.SenderAddress, is.Email, validation.Required),
|
validation.Field(&c.SenderAddress, is.EmailFormat, validation.Required),
|
||||||
validation.Field(&c.VerificationTemplate, validation.Required),
|
validation.Field(&c.VerificationTemplate, validation.Required),
|
||||||
validation.Field(&c.ResetPasswordTemplate, validation.Required),
|
validation.Field(&c.ResetPasswordTemplate, validation.Required),
|
||||||
validation.Field(&c.ConfirmEmailChangeTemplate, validation.Required),
|
validation.Field(&c.ConfirmEmailChangeTemplate, validation.Required),
|
||||||
|
|
|
@ -65,7 +65,7 @@ func (form *AdminPasswordResetRequest) Validate() error {
|
||||||
&form.Email,
|
&form.Email,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,7 +86,7 @@ func (form *AdminUpsert) Validate() error {
|
||||||
&form.Email,
|
&form.Email,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
validation.By(form.checkUniqueEmail),
|
validation.By(form.checkUniqueEmail),
|
||||||
),
|
),
|
||||||
validation.Field(
|
validation.Field(
|
||||||
|
|
|
@ -34,7 +34,7 @@ func (form *TestEmailSend) Validate() error {
|
||||||
&form.Email,
|
&form.Email,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
),
|
),
|
||||||
validation.Field(
|
validation.Field(
|
||||||
&form.Template,
|
&form.Template,
|
||||||
|
|
|
@ -62,7 +62,7 @@ func (form *UserEmailChangeRequest) Validate() error {
|
||||||
&form.NewEmail,
|
&form.NewEmail,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
validation.By(form.checkUniqueEmail),
|
validation.By(form.checkUniqueEmail),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
@ -66,7 +66,7 @@ func (form *UserPasswordResetRequest) Validate() error {
|
||||||
&form.Email,
|
&form.Email,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,7 +83,7 @@ func (form *UserUpsert) Validate() error {
|
||||||
&form.Email,
|
&form.Email,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
validation.By(form.checkEmailDomain),
|
validation.By(form.checkEmailDomain),
|
||||||
validation.By(form.checkUniqueEmail),
|
validation.By(form.checkUniqueEmail),
|
||||||
),
|
),
|
||||||
|
|
|
@ -66,7 +66,7 @@ func (form *UserVerificationRequest) Validate() error {
|
||||||
&form.Email,
|
&form.Email,
|
||||||
validation.Required,
|
validation.Required,
|
||||||
validation.Length(1, 255),
|
validation.Length(1, 255),
|
||||||
is.Email,
|
is.EmailFormat,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -189,7 +189,7 @@ func (validator *RecordDataValidator) checkEmailValue(field *schema.SchemaField,
|
||||||
return nil // nothing to check
|
return nil // nothing to check
|
||||||
}
|
}
|
||||||
|
|
||||||
if is.Email.Validate(val) != nil {
|
if is.EmailFormat.Validate(val) != nil {
|
||||||
return validation.NewError("validation_invalid_email", "Must be a valid email")
|
return validation.NewError("validation_invalid_email", "Must be a valid email")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue