From 612b2504fecab7709b22a521bbd024d63e36bdbb Mon Sep 17 00:00:00 2001 From: xavi <114113189+volcanonoodle@users.noreply.github.com> Date: Thu, 20 Feb 2025 20:09:29 +0100 Subject: [PATCH] [release-11.1.13] IAM: fix grafana_com OAuth connector config overriding (#101079) --- pkg/login/social/connectors/grafana_com_oauth.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/login/social/connectors/grafana_com_oauth.go b/pkg/login/social/connectors/grafana_com_oauth.go index 86006149b8d..c6bbcae53b7 100644 --- a/pkg/login/social/connectors/grafana_com_oauth.go +++ b/pkg/login/social/connectors/grafana_com_oauth.go @@ -38,13 +38,13 @@ type OrgRecord struct { } func NewGrafanaComProvider(info *social.OAuthInfo, cfg *setting.Cfg, orgRoleMapper *OrgRoleMapper, ssoSettings ssosettings.Service, features featuremgmt.FeatureToggles) *SocialGrafanaCom { - s := newSocialBase(social.GrafanaComProviderName, orgRoleMapper, info, features, cfg) - // Override necessary settings info.AuthUrl = cfg.GrafanaComURL + "/oauth2/authorize" info.TokenUrl = cfg.GrafanaComURL + "/api/oauth2/token" info.AuthStyle = "inheader" + s := newSocialBase(social.GrafanaComProviderName, orgRoleMapper, info, features, cfg) + allowedOrganizations, err := util.SplitStringWithError(info.Extra[allowedOrganizationsKey]) if err != nil { s.log.Error("Invalid auth configuration setting", "config", allowedOrganizationsKey, "provider", social.GrafanaComProviderName, "error", err)