AuthN: Lock down manual role updates for users synced through Grafana Com portal (#72044)

take into account auth.grafananet config section when checking if gcom auth is enabled
2023-07-21 15:22:28 +01:00
parent 12f7524c86
commit 59eb2f68b7
2 changed files with 10 additions and 1 deletions
@@ -133,7 +133,7 @@ func IsProviderEnabled(cfg *setting.Cfg, authModule string) bool {
 	case GithubAuthModule:
 		return cfg.GitHubAuthEnabled
 	case GrafanaComAuthModule:
-		return cfg.GrafanaComAuthEnabled
+		return cfg.GrafanaComAuthEnabled || cfg.GrafanaNetAuthEnabled
 	case GenericOAuthModule:
 		return cfg.GenericOAuthAuthEnabled
 	}