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

DEV: make sure we handle staged users correctly in DiscourseConnect (#15320)

Browse Source 
Some time ago, we made this fix to external authentication –  https://github.com/discourse/discourse/pull/13706. We didn't address Discourse Connect (https://meta.discourse.org/t/discourseconnect-official-single-sign-on-for-discourse-sso/13045) at that moment, so I wanted to fix it for Discourse Connect as well.

Turned out though that Discourse Connect doesn't contain this problem and already handles staged users correctly. This PR adds tests that confirm it. Also, I've extracted two functions in Discourse Connect implementation along the way and decided to merge this refactoring too (the refactoring is supported with tests).
This commit is contained in:
Andrei Prigorshnev
2021-12-16 16:44:07 +01:00
committed by GitHub
parent c46b351888
commit 9365c4b364
3 changed files with 105 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/models/discourse_single_sign_on.rb
View File

@@ -239,20 +239,10 @@ class DiscourseSingleSignOn < SingleSignOn
DistributedMutex.synchronize("discourse_single_sign_on_#{email}") do
user = User.find_by_email(email) if !require_activation
if !user
try_name = name.presence
try_username = username.presence
name_suggester_input = try_username
username_suggester_input = try_username || try_name
if SiteSetting.use_email_for_username_and_name_suggestions
name_suggester_input = name_suggester_input || email
username_suggester_input = username_suggester_input || email
end
user_params = {
primary_email: UserEmail.new(email: email, primary: true),
name: try_name || User.suggest_name(name_suggester_input),
username: UserNameSuggester.suggest(username_suggester_input),
name: resolve_name,
username: resolve_username,
ip_address: ip_address
}
@@ -381,4 +371,22 @@ class DiscourseSingleSignOn < SingleSignOn
sso_record.external_profile_background_url = profile_background_url
sso_record.external_card_background_url = card_background_url
end
def resolve_username
username_suggester_input = username.presence || name.presence
if SiteSetting.use_email_for_username_and_name_suggestions
username_suggester_input = username_suggester_input || email
end
UserNameSuggester.suggest(username_suggester_input)
end
def resolve_name
name_suggester_input = username.presence
if SiteSetting.use_email_for_username_and_name_suggestions
name_suggester_input = name_suggester_input || email
end
name.presence || User.suggest_name(name_suggester_input)
end
end