github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-30 15:46:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Handle both name formats in managed authenticator (#7925)

Browse Source
This commit is contained in:
Angus McLeod 2019-07-24 19:22:26 +10:00 committed by David Taylor
parent 02e27b5cff
commit 47ad2a4d7a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/auth/managed_authenticator.rb
View File

@ -85,7 +85,7 @@ class Auth::ManagedAuthenticator < Auth::Authenticator
result = Auth::Result.new
info = auth_token[:info]
result.email = info[:email]
result.name = "#{info[:first_name]} #{info[:last_name]}"
result.name = info[:first_name] && info[:last_name] ? "#{info[:first_name]} #{info[:last_name]}" : info[:name]
result.username = info[:nickname]
result.email_valid = primary_email_verified?(auth_token) if result.email
result.extra_data = {