diff --git a/pkg/services/ssosettings/strategies/saml_strategy.go b/pkg/services/ssosettings/strategies/saml_strategy.go index fa37bb6b46b..e6e820474fc 100644 --- a/pkg/services/ssosettings/strategies/saml_strategy.go +++ b/pkg/services/ssosettings/strategies/saml_strategy.go @@ -63,6 +63,10 @@ func (s *SAMLStrategy) loadSAMLSettings() map[string]any { "role_values_grafana_admin": section.KeyValue("role_values_grafana_admin").MustString(""), "name_id_format": section.KeyValue("name_id_format").MustString(""), "skip_org_role_sync": section.KeyValue("skip_org_role_sync").MustBool(false), + "client_id": section.KeyValue("client_id").MustString(""), + "client_secret": section.KeyValue("client_secret").MustString(""), + "token_url": section.KeyValue("token_url").MustString(""), + "force_use_graph_api": section.KeyValue("force_use_graph_api").MustBool(false), } return result } diff --git a/pkg/services/ssosettings/strategies/saml_strategy_test.go b/pkg/services/ssosettings/strategies/saml_strategy_test.go index 489a3f1e7a7..fb61b54893e 100644 --- a/pkg/services/ssosettings/strategies/saml_strategy_test.go +++ b/pkg/services/ssosettings/strategies/saml_strategy_test.go @@ -45,6 +45,10 @@ var ( name_id_format = urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress skip_org_role_sync = false role_values_none = guest disabled + token_url = http://localhost:8086/auth/realms/grafana/protocol/openid-connect/token + client_id = grafana + client_secret = grafana + force_use_graph_api = false ` expectedSAMLInfo = map[string]any{ @@ -79,6 +83,10 @@ var ( "name_id_format": "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress", "skip_org_role_sync": false, "role_values_none": "guest disabled", + "token_url": "http://localhost:8086/auth/realms/grafana/protocol/openid-connect/token", + "client_id": "grafana", + "client_secret": "grafana", + "force_use_graph_api": false, } )