diff options
author | GotenXiao <me@gotenxiao.co.uk> | 2019-02-06 16:48:36 +0000 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-02-06 16:48:36 +0000 |
commit | 7a1c810dc90080531e90cec68da37173988a2ec5 (patch) | |
tree | c5f2a6ea3da80e7aa00b49e62404862c5c97d79d /config/initializers | |
parent | 20c83bbdb0a9729a308957397b37a2569486116f (diff) | |
download | gitlab-ce-7a1c810dc90080531e90cec68da37173988a2ec5.tar.gz |
Fix #44332 - Add support for profile and email
Diffstat (limited to 'config/initializers')
-rw-r--r-- | config/initializers/doorkeeper_openid_connect.rb | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb index e97c0fcbd6b..fd5a62c39c6 100644 --- a/config/initializers/doorkeeper_openid_connect.rb +++ b/config/initializers/doorkeeper_openid_connect.rb @@ -31,8 +31,27 @@ Doorkeeper::OpenidConnect.configure do o.claim(:name) { |user| user.name } o.claim(:nickname) { |user| user.username } - o.claim(:email) { |user| user.public_email } - o.claim(:email_verified) { |user| true if user.public_email? } + + # Check whether the application has access to the email scope, and grant + # access to the user's primary email address if so, otherwise their + # public email address (if present) + # This allows existing solutions built for GitLab's old behavior to keep + # working without modification. + o.claim(:email) do |user, scopes| + scopes.exists?(:email) ? user.email : user.public_email + end + o.claim(:email_verified) do |user, scopes| + if scopes.exists?(:email) + user.primary_email_verified? + elsif user.public_email? + user.verified_email?(user.public_email) + else + # If there is no public email set, tell doorkicker-openid-connect to + # exclude the email_verified claim by returning nil. + nil + end + end + o.claim(:website) { |user| user.full_website_url if user.website_url? } o.claim(:profile) { |user| Gitlab::Routing.url_helpers.user_url user } o.claim(:picture) { |user| user.avatar_url(only_path: false) } |