IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: EmailValidator needs to validate format of email.

Browse Source
This commit is contained in:
Guo Xiang Tan
2020-06-03 10:13:25 +08:00
parent 1b5a505930
commit 062db10c52
7 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/invite.rb
View File

@@ -18,7 +18,7 @@ class Invite < ActiveRecord::Base
has_many :topic_invites
has_many :topics, through: :topic_invites, source: :topic
validates_presence_of :invited_by_id
validates :email, email: true, format: { with: EmailValidator.email_regex }, allow_blank: true
validates :email, email: true, allow_blank: true
before_create do
self.invite_key ||= SecureRandom.hex

3
app/models/user_email.rb
View File

@@ -11,8 +11,7 @@ class UserEmail < ActiveRecord::Base
before_validation :strip_downcase_email
validates :email, presence: true
validates :email, email: true, format: { with: EmailValidator.email_regex },
if: :validate_email?
validates :email, email: true, if: :validate_email?
validates :primary, uniqueness: { scope: [:user_id] }, if: [:user_id, :primary]
validate :user_id_not_changed, if: :primary