From b9db73c46a54ebb7483440b4cf267d0acadf7653 Mon Sep 17 00:00:00 2001
From: Allen Zhong <allen@moe.cat>
Date: Fri, 8 May 2020 11:49:20 +0800
Subject: [PATCH] Revert "Change e-mail whitelist/blacklist to not be checked
 when invited (#10683)"

This reverts commit 7cb369d4c66c4381c856a2714b4117d6204cd4bb.
---
 app/models/user.rb                                  | 2 +-
 app/validators/blacklisted_email_validator.rb       | 5 +----
 spec/validators/blacklisted_email_validator_spec.rb | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 9b0aa41485c803..05a19750d73293 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -82,7 +82,7 @@ class User < ApplicationRecord
   accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? }
 
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
-  validates_with BlacklistedEmailValidator, on: :create
+  validates_with BlacklistedEmailValidator, if: :email_changed?
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create
 
diff --git a/app/validators/blacklisted_email_validator.rb b/app/validators/blacklisted_email_validator.rb
index 0d01a1c47fb7fb..a2061fdd311069 100644
--- a/app/validators/blacklisted_email_validator.rb
+++ b/app/validators/blacklisted_email_validator.rb
@@ -2,10 +2,7 @@
 
 class BlacklistedEmailValidator < ActiveModel::Validator
   def validate(user)
-    return if user.valid_invitation?
-
     @email = user.email
-
     user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?
   end
 
@@ -16,7 +13,7 @@ def blocked_email?
   end
 
   def on_blacklist?
-    return true  if EmailDomainBlock.block?(@email)
+    return true if EmailDomainBlock.block?(@email)
     return false if Rails.configuration.x.email_domains_blacklist.blank?
 
     domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
diff --git a/spec/validators/blacklisted_email_validator_spec.rb b/spec/validators/blacklisted_email_validator_spec.rb
index ccc5dc0f485050..d2e442f4ab40bc 100644
--- a/spec/validators/blacklisted_email_validator_spec.rb
+++ b/spec/validators/blacklisted_email_validator_spec.rb
@@ -8,7 +8,6 @@
     let(:errors) { double(add: nil) }
 
     before do
-      allow(user).to receive(:valid_invitation?) { false }
       allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email }
       described_class.new.validate(user)
     end