about summary refs log tree commit diff
path: root/app/validators/email_mx_validator.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2021-03-01 04:59:13 +0100
committerGitHub <noreply@github.com>2021-03-01 04:59:13 +0100
commit9aa37b32c3307dcb5896e1b768967666a6fdbf65 (patch)
treed10630dcc1a46d450be7b711e9ae47c91492d2cf /app/validators/email_mx_validator.rb
parentb4cb8c3c8356e226061fd70ae2139318c6a558e5 (diff)
Add `details` to error response for `POST /api/v1/accounts` in REST API (#15803)
Diffstat (limited to 'app/validators/email_mx_validator.rb')
-rw-r--r--app/validators/email_mx_validator.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/app/validators/email_mx_validator.rb b/app/validators/email_mx_validator.rb
index ef1554494..9f70a1469 100644
--- a/app/validators/email_mx_validator.rb
+++ b/app/validators/email_mx_validator.rb
@@ -4,16 +4,19 @@ require 'resolv'
 
 class EmailMxValidator < ActiveModel::Validator
   def validate(user)
+    return if user.email.blank?
+
     domain = get_domain(user.email)
 
-    if domain.nil?
-      user.errors.add(:email, I18n.t('users.invalid_email'))
+    if domain.blank?
+      user.errors.add(:email, :invalid)
     else
       ips, hostnames = resolve_mx(domain)
+
       if ips.empty?
-        user.errors.add(:email, I18n.t('users.invalid_email_mx'))
+        user.errors.add(:email, :unreachable)
       elsif on_blacklist?(hostnames + ips)
-        user.errors.add(:email, I18n.t('users.blocked_email_provider'))
+        user.errors.add(:email, :blocked)
       end
     end
   end