Remove AuthConfigUIAdminAccess (#85452)

* Remove AuthConfigUIAdminAccess
pull/85473/head
linoman 2 years ago committed by GitHub
parent 22bae345d6
commit 147154d2ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 4
      pkg/services/accesscontrol/roles.go
  2. 6
      pkg/setting/setting.go

@ -327,10 +327,6 @@ func DeclareFixedRoles(service Service, cfg *setting.Cfg) error {
Grants: []string{RoleGrafanaAdmin},
}
if cfg.AuthConfigUIAdminAccess {
authenticationConfigWriter.Grants = append(authenticationConfigWriter.Grants, string(org.RoleAdmin))
}
return service.DeclareFixedRoles(ldapReader, ldapWriter, orgUsersReader, orgUsersWriter,
settingsReader, statsReader, usersReader, usersWriter, authenticationConfigWriter, generalAuthConfigWriter)
}

@ -241,9 +241,6 @@ type Cfg struct {
IDResponseHeaderEnabled bool
IDResponseHeaderPrefix string
IDResponseHeaderNamespaces map[string]struct{}
// Not documented & not supported
// stand in until a more complete solution is implemented
AuthConfigUIAdminAccess bool
// AWS Plugin Auth
AWSAllowedAuthProviders []string
@ -1558,9 +1555,6 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
cfg.TokenRotationIntervalMinutes = 2
}
// Do not use
cfg.AuthConfigUIAdminAccess = auth.Key("config_ui_admin_access").MustBool(false)
cfg.DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
cfg.DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)

Loading…
Cancel
Save