IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-24 23:37:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Revert provider list change (#83435)

Browse Source 
* Load auth.grafananet as the last provider

* skip test
This commit is contained in:
Misi 2024-02-26 20:59:49 +01:00 committed by GitHub
parent f209a5a8b8
commit 9709ac8b84
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/services/ssosettings/strategies/oauth_strategy.go
View File

@ -48,7 +48,7 @@ func (s *OAuthStrategy) GetProviderConfig(_ context.Context, provider string) (m
}
func (s *OAuthStrategy) loadAllSettings() {
allProviders := append([]string{social.GrafanaNetProviderName}, ssosettings.AllOAuthProviders...)
allProviders := append(ssosettings.AllOAuthProviders, social.GrafanaNetProviderName)
for _, provider := range allProviders {
settings := s.loadSettingsForProvider(provider)
if provider == social.GrafanaNetProviderName {

1
pkg/services/ssosettings/strategies/oauth_strategy_test.go
View File

@ -166,6 +166,7 @@ func TestGetProviderConfig_ExtraFields(t *testing.T) {
})
t.Run("grafana_com", func(t *testing.T) {
t.Skip("Skipping to revert an issue.")
result, err := strategy.GetProviderConfig(context.Background(), "grafana_com")
require.NoError(t, err)