[v10.1.x] Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72818)
Auth: Add missing skipOrgRoleSync property to SocialBase for GenericOAuth (#72752)
* add missing cfg for skiporgrolesync
* add google skiporgrolesync
* removed google skip
* update docs to reflect google
* remove docs update for google
(cherry picked from commit 27f57fe112)
Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>
This commit is contained in:
co-authored by
Eric Leijonmarck
parent
816d840dd2
commit
e5db5bcec7
@@ -27,6 +27,7 @@ type SocialGenericOAuth struct {
|
||||
teamIdsAttributePath string
|
||||
teamIds []string
|
||||
allowedGroups []string
|
||||
skipOrgRoleSync bool
|
||||
}
|
||||
|
||||
func (s *SocialGenericOAuth) IsGroupMember(groups []string) bool {
|
||||
|
||||
@@ -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,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user