A platform for community discussion. Free, open, simple.
FEATURE: Support oidc groups claim from id_token (#40035)
David Taylor9804610119fb
diff --git a/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb b/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rbindex ff6c5cc9053..46da227d6a2 100644--- a/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb+++ b/plugins/discourse-openid-connect/lib/omniauth_open_id_connect.rb@@ -210,6 +210,7 @@ module OmniAuthhash = {}hash[:raw_info] = options.use_userinfo ? userinfo_response : id_token_infohash[:id_token] = access_token["id_token"]+ hash[:id_token_info] = id_token_infoprune! hashenddiff --git a/plugins/discourse-openid-connect/lib/openid_connect_authenticator.rb b/plugins/discourse-openid-connect/lib/openid_connect_authenticator.rbindex 2a638eec9ca..edb2f9901fe 100644--- a/plugins/discourse-openid-connect/lib/openid_connect_authenticator.rb+++ b/plugins/discourse-openid-connect/lib/openid_connect_authenticator.rb@@ -41,7 +41,8 @@ class OpenIDConnectAuthenticator < Auth::ManagedAuthenticatorif provides_groups?claim = SiteSetting.openid_connect_groups_claimresult.associated_groups = []- groups = auth_token.extra&.dig(:raw_info, claim)+ groups =+ auth_token.extra&.dig(:raw_info, claim) || auth_token.extra&.dig(:id_token_info, claim)if groups.is_a?(Array)result.associated_groups = groups.map { |group_name| { id: group_name, name: group_name } }diff --git a/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb b/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rbindex 6ded7713d2b..78a87def970 100644--- a/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb+++ b/plugins/discourse-openid-connect/spec/lib/omniauth_open_id_connect_spec.rb@@ -250,6 +250,12 @@ describe OmniAuth::Strategies::OpenIDConnect do)expect(@app_called).to eq(false)end++ it "exposes id_token_info alongside the userinfo raw_info" do+ expect(strategy.callback_phase[0]).to eq(200)+ expect(strategy.extra[:raw_info]["email"]).to eq("[email protected]")+ expect(strategy.extra[:id_token_info]["email"]).to eq("[email protected]")+ endendendenddiff --git a/plugins/discourse-openid-connect/spec/lib/openid_connect_authenticator_spec.rb b/plugins/discourse-openid-connect/spec/lib/openid_connect_authenticator_spec.rbindex df816aa3ad0..b76a8f4dc19 100644--- a/plugins/discourse-openid-connect/spec/lib/openid_connect_authenticator_spec.rb+++ b/plugins/discourse-openid-connect/spec/lib/openid_connect_authenticator_spec.rb@@ -119,6 +119,21 @@ describe OpenIDConnectAuthenticator doresult = authenticator.after_authenticate(hash)expect(result.associated_groups).to eq([])end++ it "falls back to the id_token when the claim is missing from raw_info" do+ hash[:extra][:id_token_info] = { "groups" => %w[group1 group2] }+ result = authenticator.after_authenticate(hash)+ expect(result.associated_groups).to eq(+ [{ id: "group1", name: "group1" }, { id: "group2", name: "group2" }],+ )+ end++ it "prefers raw_info over the id_token when both contain the claim" do+ hash[:extra][:raw_info][:groups] = %w[from_userinfo]+ hash[:extra][:id_token_info] = { "groups" => %w[from_id_token] }+ result = authenticator.after_authenticate(hash)+ expect(result.associated_groups).to eq([{ id: "from_userinfo", name: "from_userinfo" }])+ endendcontext "with a custom claim name" do