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

DEV: Avoid duplicating method attributes in Auth::Result.

Browse Source 
This ensures that within the class, we have a consistent order of
attributes that is passed to `UsernameSuggester`.
This commit is contained in:
Alan Guo Xiang Tan 2021-02-26 09:33:20 +08:00
parent b584222419
commit 3fc72543de
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/auth/result.rb
View File

@ -78,7 +78,7 @@ class Auth::Result
def apply_user_attributes!
change_made = false
if SiteSetting.auth_overrides_username? && username.present? && username != user.username
user.username = UserNameSuggester.suggest(username || name || email, user.username)
user.username = UserNameSuggester.suggest(username_suggester_attributes, user.username)
change_made = true
end
@ -139,7 +139,7 @@ class Auth::Result
result = {
email: email,
username: UserNameSuggester.suggest(username || name || email),
username: UserNameSuggester.suggest(username_suggester_attributes),
auth_provider: authenticator_name,
email_valid: !!email_valid,
can_edit_username: can_edit_username,
@ -155,4 +155,10 @@ class Auth::Result
result
end
private
def username_suggester_attributes
username || name || email
end
end