diff --git a/core/settings.go b/core/settings.go index db4e989d..4a592855 100644 --- a/core/settings.go +++ b/core/settings.go @@ -301,7 +301,7 @@ func (c MetaConfig) Validate() error { validation.Field(&c.AppName, validation.Required, validation.Length(1, 255)), validation.Field(&c.AppUrl, validation.Required, is.URL), 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.ResetPasswordTemplate, validation.Required), validation.Field(&c.ConfirmEmailChangeTemplate, validation.Required), diff --git a/forms/admin_password_reset_request.go b/forms/admin_password_reset_request.go index 663e38b2..546113fd 100644 --- a/forms/admin_password_reset_request.go +++ b/forms/admin_password_reset_request.go @@ -65,7 +65,7 @@ func (form *AdminPasswordResetRequest) Validate() error { &form.Email, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, ), ) } diff --git a/forms/admin_upsert.go b/forms/admin_upsert.go index ddde01bb..f2916d43 100644 --- a/forms/admin_upsert.go +++ b/forms/admin_upsert.go @@ -86,7 +86,7 @@ func (form *AdminUpsert) Validate() error { &form.Email, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, validation.By(form.checkUniqueEmail), ), validation.Field( diff --git a/forms/test_email_send.go b/forms/test_email_send.go index d1e426e6..61c21175 100644 --- a/forms/test_email_send.go +++ b/forms/test_email_send.go @@ -34,7 +34,7 @@ func (form *TestEmailSend) Validate() error { &form.Email, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, ), validation.Field( &form.Template, diff --git a/forms/user_email_change_request.go b/forms/user_email_change_request.go index f85caa8d..48823992 100644 --- a/forms/user_email_change_request.go +++ b/forms/user_email_change_request.go @@ -62,7 +62,7 @@ func (form *UserEmailChangeRequest) Validate() error { &form.NewEmail, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, validation.By(form.checkUniqueEmail), ), ) diff --git a/forms/user_password_reset_request.go b/forms/user_password_reset_request.go index 56ea9040..b5c6e491 100644 --- a/forms/user_password_reset_request.go +++ b/forms/user_password_reset_request.go @@ -66,7 +66,7 @@ func (form *UserPasswordResetRequest) Validate() error { &form.Email, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, ), ) } diff --git a/forms/user_upsert.go b/forms/user_upsert.go index 89580723..f6bf5c48 100644 --- a/forms/user_upsert.go +++ b/forms/user_upsert.go @@ -83,7 +83,7 @@ func (form *UserUpsert) Validate() error { &form.Email, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, validation.By(form.checkEmailDomain), validation.By(form.checkUniqueEmail), ), diff --git a/forms/user_verification_request.go b/forms/user_verification_request.go index 047f494b..76a3aaa9 100644 --- a/forms/user_verification_request.go +++ b/forms/user_verification_request.go @@ -66,7 +66,7 @@ func (form *UserVerificationRequest) Validate() error { &form.Email, validation.Required, validation.Length(1, 255), - is.Email, + is.EmailFormat, ), ) } diff --git a/forms/validators/record_data.go b/forms/validators/record_data.go index 49ba67c6..a5f09f95 100644 --- a/forms/validators/record_data.go +++ b/forms/validators/record_data.go @@ -189,7 +189,7 @@ func (validator *RecordDataValidator) checkEmailValue(field *schema.SchemaField, 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") }