Auth: Use auth broker by default (#69620)

remove authnservice toggle
This commit is contained in:
Jo
2023-06-07 08:57:41 +02:00
committed by GitHub
parent e17ef5e504
commit aee5c6dea0
12 changed files with 27 additions and 29 deletions
+7 -2
View File
@@ -277,6 +277,8 @@ type Cfg struct {
// Not documented & not supported
// stand in until a more complete solution is implemented
AuthConfigUIAdminAccess bool
// TO REMOVE: Not documented & not supported. Remove with legacy handlers in 10.2
AuthBrokerEnabled bool
// AWS Plugin Auth
AWSAllowedAuthProviders []string
@@ -553,7 +555,7 @@ type CommandLineArgs struct {
Args []string
}
func (cfg Cfg) parseAppUrlAndSubUrl(section *ini.Section) (string, string, error) {
func (cfg *Cfg) parseAppUrlAndSubUrl(section *ini.Section) (string, string, error) {
appUrl := valueAsString(section, "root_url", "http://localhost:3000/")
if appUrl[len(appUrl)-1] != '/' {
@@ -776,7 +778,7 @@ func applyCommandLineProperties(props map[string]string, file *ini.File) {
}
}
func (cfg Cfg) getCommandLineProperties(args []string) map[string]string {
func (cfg *Cfg) getCommandLineProperties(args []string) map[string]string {
props := make(map[string]string)
for _, arg := range args {
@@ -1492,8 +1494,11 @@ func readAuthSettings(iniFile *ini.File, cfg *Cfg) (err error) {
// Debug setting unlocking frontend auth sync lock. Users will still be reset on their next login.
cfg.DisableSyncLock = auth.Key("disable_sync_lock").MustBool(false)
// Do not use
cfg.AuthConfigUIAdminAccess = auth.Key("config_ui_admin_access").MustBool(false)
cfg.AuthBrokerEnabled = auth.Key("broker").MustBool(true)
cfg.DisableLoginForm = auth.Key("disable_login_form").MustBool(false)
DisableSignoutMenu = auth.Key("disable_signout_menu").MustBool(false)