From: Claire <claire.github-309c@sitedethib.com>
Date: Thu, 25 Aug 2022 02:31:10 +0000 (+0200)
Subject: Add option for EMAIL_DOMAIN_DENYLIST/EMAIL_DOMAIN_ALLOWLIST to apply after confirmati... 
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cd0ce855ccb86bc4816163509fdc43d97d6b8cd8;p=mastodon.git

Add option for EMAIL_DOMAIN_DENYLIST/EMAIL_DOMAIN_ALLOWLIST to apply after confirmation (#18642)

Fixes #18620
---

diff --git a/app/models/user.rb b/app/models/user.rb
index de4b73a7e..f20838044 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -94,7 +94,7 @@ class User < ApplicationRecord
   validates :invite_request, presence: true, on: :create, if: :invite_text_required?
 
   validates :locale, inclusion: I18n.available_locales.map(&:to_s), if: :locale?
-  validates_with BlacklistedEmailValidator, if: -> { !confirmed? }
+  validates_with BlacklistedEmailValidator, if: -> { ENV['EMAIL_DOMAIN_LISTS_APPLY_AFTER_CONFIRMATION'] == 'true' || !confirmed? }
   validates_with EmailMxValidator, if: :validate_email_dns?
   validates :agreement, acceptance: { allow_nil: false, accept: [true, 'true', '1'] }, on: :create