summaryrefslogtreecommitdiff
path: root/config/initializers/doorkeeper_openid_connect.rb
diff options
context:
space:
mode:
Diffstat (limited to 'config/initializers/doorkeeper_openid_connect.rb')
-rw-r--r--config/initializers/doorkeeper_openid_connect.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/initializers/doorkeeper_openid_connect.rb b/config/initializers/doorkeeper_openid_connect.rb
index 12a963ce45d..476230d0f70 100644
--- a/config/initializers/doorkeeper_openid_connect.rb
+++ b/config/initializers/doorkeeper_openid_connect.rb
@@ -57,7 +57,8 @@ Doorkeeper::OpenidConnect.configure do
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) }
- o.claim(:groups) { |user| user.membership_groups.map(&:full_path) }
+ o.claim(:groups) { |user| user.membership_groups.joins(:route).with_route.map(&:full_path) }
+ o.claim(:groups_direct, response: [:id_token]) { |user| user.groups.joins(:route).with_route.map(&:full_path) }
end
end
end