github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 22:34:42 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: pull email address validation out to a new EmailAddressValidator

Browse Source 
We validate the *format* of email addresses in many places with a match against
a regex, often with very slightly different syntax.

Adding a separate EmailAddressValidator simplifies the code in a few spots and
feels cleaner.

Deprecated the old location in case someone is using it in a plugin.

No functionality change is in this commit.

Note: the regex used at the moment does not support using address literals, e.g.:
* localpart@[192.168.0.1]
* localpart@[2001:db8::1]
This commit is contained in:
Michael Brown
2022-02-17 20:12:51 -05:00
committed by Michael Brown
parent e54b70460e
commit 3bf3b9a4a5
16 changed files with 51 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/email_change_request.rb
View File

@ -6,7 +6,7 @@ class EmailChangeRequest < ActiveRecord::Base
belongs_to :new_email_token, class_name: 'EmailToken', dependent: :destroy
belongs_to :requested_by, class_name: "User", foreign_key: :requested_by_user_id
validates :new_email, presence: true, format: { with: EmailValidator.email_regex }
validates :new_email, presence: true, format: { with: EmailAddressValidator.email_regex }
def self.states
@states ||= Enum.new(authorizing_old: 1, authorizing_new: 2, complete: 3)