github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 21:45:26 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Revert "FEATURE: enforce_canonical_emails site setting"

Browse Source 
This reverts commit 6f9177e2ed273ebebb8306299425cbfabbf57101.

We decided on a completely different approach to the problem.

Instead we will let blocked emails be treated as canonical.
This commit is contained in:
Sam Saffron
2020-04-24 13:25:35 +10:00
parent 6df22638e1
commit 6a18c9aa0b
6 changed files with 22 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/models/user_email.rb
View File

@ -15,27 +15,12 @@ class UserEmail < ActiveRecord::Base
validate :user_id_not_changed, if: :primary
validate :unique_email
before_save :save_canonical
scope :secondary, -> { where(primary: false) }
def self.canonical(email)
name, domain = email.split('@', 2)
name = name.gsub(/\+.*/, '')
if ['gmail.com', 'googlemail.com'].include?(domain.downcase)
name = name.gsub('.', '')
end
"#{name}@#{domain}".downcase
end
self.ignored_columns = ['canonical_email']
private
def save_canonical
if SiteSetting.enforce_canonical_emails && self.will_save_change_to_email?
self.canonical_email = UserEmail.canonical(self.email)
end
end
def strip_downcase_email
if self.email
self.email = self.email.strip
@ -49,14 +34,8 @@ class UserEmail < ActiveRecord::Base
end
def unique_email
if self.will_save_change_to_email?
exists = self.class.where("lower(email) = ?", email).exists?
exists ||= SiteSetting.enforce_canonical_emails &&
self.class.where("canonical_email = ?", UserEmail.canonical(email)).exists?
if exists
self.errors.add(:email, :taken)
end
if self.will_save_change_to_email? && self.class.where("lower(email) = ?", email).exists?
self.errors.add(:email, :taken)
end
end
@ -73,17 +52,15 @@ end
#
# Table name: user_emails
#
# id :integer not null, primary key
# user_id :integer not null
# email :string(513) not null
# primary :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
# canonical_email :string
# id :integer not null, primary key
# user_id :integer not null
# email :string(513) not null
# primary :boolean default(FALSE), not null
# created_at :datetime not null
# updated_at :datetime not null
#
# Indexes
#
# index_user_emails_on_canonical_email (canonical_email) WHERE (canonical_email IS NOT NULL)
# index_user_emails_on_email (lower((email)::text)) UNIQUE
# index_user_emails_on_user_id (user_id)
# index_user_emails_on_user_id_and_primary (user_id,primary) UNIQUE WHERE "primary"