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

FIX: DiscourseConnect login did not auto approve based on email domain (#17006)

Browse Source 
This commit resolves a bug where users are not auto approved based on
`SiteSetting.auto_approve_email_domains` when
`SiteSetting.must_approve_users` has been enabled.
This commit is contained in:
Alan Guo Xiang Tan
2022-06-06 15:16:01 +08:00
committed by GitHub
parent 42683d4874
commit 9f08a3b160
2 changed files with 118 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/discourse_connect.rb
View File

@ -238,6 +238,7 @@ class DiscourseConnect < DiscourseConnectBase
# the same email payload
DistributedMutex.synchronize("discourse_single_sign_on_#{email}") do
user = User.find_by_email(email) if !require_activation
if !user
user_params = {
primary_email: UserEmail.new(email: email, primary: true),
@ -250,7 +251,13 @@ class DiscourseConnect < DiscourseConnectBase
user_params[:locale] = locale
end
user = User.create!(user_params)
user = User.new(user_params)
if SiteSetting.must_approve_users && EmailValidator.can_auto_approve_user?(email)
ReviewableUser.set_approved_fields!(user, Discourse.system_user)
end
user.save!
if SiteSetting.verbose_discourse_connect_logging
Rails.logger.warn("Verbose SSO log: New User (user_id: #{user.id}) Params: #{user_params} User Params: #{user.attributes} User Errors: #{user.errors.full_messages} Email: #{user.primary_email.attributes} Email Error: #{user.primary_email.errors.full_messages}")