diff --git a/pkg/services/accesscontrol/roles.go b/pkg/services/accesscontrol/roles.go index 5c82eefb8f4..48e493ea3ef 100644 --- a/pkg/services/accesscontrol/roles.go +++ b/pkg/services/accesscontrol/roles.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) } diff --git a/pkg/setting/setting.go b/pkg/setting/setting.go index a76604b1975..c2258d96b6c 100644 --- a/pkg/setting/setting.go +++ b/pkg/setting/setting.go @@ -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)