IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Auth: Remove oauth skip org role sync (#84972)

Browse Source 
* remove oauth wide skip org role sync

* we are warning from config

* set it to false

* removed from config ini files and updated docs
This commit is contained in:
Eric Leijonmarck
2024-03-22 15:34:05 +01:00
committed by GitHub
parent f2c7023fe6
commit bb792ff540
11 changed files with 8 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/setting/setting.go
View File

@@ -1571,11 +1571,9 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
cfg.OAuthCookieMaxAge = auth.Key("oauth_state_cookie_max_age").MustInt(600)
cfg.SignoutRedirectUrl = valueAsString(auth, "signout_redirect_url", "")
// Deprecated
cfg.OAuthSkipOrgRoleUpdateSync = auth.Key("oauth_skip_org_role_update_sync").MustBool(false)
if cfg.OAuthSkipOrgRoleUpdateSync {
cfg.Logger.Warn("[Deprecated] The oauth_skip_org_role_update_sync configuration setting is deprecated. Please use skip_org_role_sync inside the auth provider section instead.")
}
cfg.OAuthSkipOrgRoleUpdateSync = false
cfg.DisableLogin = auth.Key("disable_login").MustBool(false)