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

FIX: skip email if blank while syncing SSO attributes. (#19939)

Browse Source 
Also, return email blank error in `EmailValidator`  when the email is blank.
This commit is contained in:
Vinoth Kannan
2023-01-24 09:10:24 +05:30
committed by GitHub
parent 0924f874bd
commit 799202d50b
5 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/discourse_connect.rb
View File

@ -328,7 +328,7 @@ class DiscourseConnect < DiscourseConnectBase
def change_external_attributes_and_override(sso_record, user)
@email_changed = false
if SiteSetting.auth_overrides_email && user.email != Email.downcase(email)
if SiteSetting.auth_overrides_email && email.present? && user.email != Email.downcase(email)
user.email = email
user.active = false if require_activation
@email_changed = true