IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 01:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72752)

Browse Source 
* add missing cfg for skiporgrolesync

* add google skiporgrolesync

* removed google skip

* update docs to reflect google

* remove docs update for google
This commit is contained in:
Eric Leijonmarck 2023-08-03 14:56:11 +02:00 committed by GitHub
parent 2c949a6a33
commit 27f57fe112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/login/social/generic_oauth.go
View File

@ -27,6 +27,7 @@ type SocialGenericOAuth struct {
teamIdsAttributePath string
teamIds []string
allowedGroups []string
skipOrgRoleSync bool
}
func (s *SocialGenericOAuth) IsGroupMember(groups []string) bool {

1
pkg/login/social/social.go
View File

@ -239,6 +239,7 @@ func ProvideService(cfg *setting.Cfg,
teamIds: sec.Key("team_ids").Strings(","),
allowedOrganizations: util.SplitString(sec.Key("allowed_organizations").String()),
allowedGroups: util.SplitString(sec.Key("allowed_groups").String()),
skipOrgRoleSync: cfg.GenericOAuthSkipOrgRoleSync,
}
}