diff options
Diffstat (limited to 'config/initializers/doorkeeper_openid_connect.rb')
| -rw-r--r-- | config/initializers/doorkeeper_openid_connect.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb index b2cb1843fab..a3a2550811b 100644 --- a/config/initializers/doorkeeper_openid_connect.rb +++ b/config/initializers/doorkeeper_openid_connect.rb @@ -31,8 +31,9 @@ Doorkeeper::OpenidConnect.configure do Digest::SHA256.hexdigest "#{user.id}-#{Rails.application.secrets.secret_key_base}" end - o.claim(:name) { |user| user.name } - o.claim(:nickname) { |user| user.username } + o.claim(:name) { |user| user.name } + o.claim(:nickname) { |user| user.username } + o.claim(:preferred_username) { |user| user.username } # Check whether the application has access to the email scope, and grant # access to the user's primary email address if so, otherwise their @@ -54,7 +55,7 @@ Doorkeeper::OpenidConnect.configure do end end - o.claim(:website) { |user| user.full_website_url if user.website_url? } + o.claim(:website) { |user| user.full_website_url if user.website_url.present? } o.claim(:profile) { |user| Gitlab::Routing.url_helpers.user_url user } o.claim(:picture) { |user| user.avatar_url(only_path: false) } o.claim(:groups) { |user| user.membership_groups.joins(:route).with_route.map(&:full_path) } |