techhub/mastodon
2
0
Fork 0
Code Activity

Improve email address validation (#29838)

Browse Source
This commit is contained in:
Claire
2024-04-05 09:48:45 +02:00
committed by GitHub
parent 1f11aa5f04
commit 38b9d31f63
5 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@@ -95,6 +95,8 @@ class User < ApplicationRecord
accepts_nested_attributes_for :invite_request, reject_if: ->(attributes) { attributes['text'].blank? && !Setting.require_invite_text }
validates :invite_request, presence: true, on: :create, if: :invite_text_required?
validates :email, presence: true, email_address: true
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