diff options
Diffstat (limited to 'cmd/platform')
| -rw-r--r-- | cmd/platform/server.go | 4 | ||||
| -rw-r--r-- | cmd/platform/user.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/platform/server.go b/cmd/platform/server.go index 67e2dcc56..4c36f5a46 100644 --- a/cmd/platform/server.go +++ b/cmd/platform/server.go @@ -75,10 +75,10 @@ func runServer(configFileLocation string) { a.LoadLicense() } - a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) + a.InitPlugins(*a.Config().PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) utils.AddConfigListener(func(prevCfg, cfg *model.Config) { if *cfg.PluginSettings.Enable { - a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory) + a.InitPlugins(*cfg.PluginSettings.Directory, *a.Config().PluginSettings.ClientDirectory, nil) } else { a.ShutDownPlugins() } diff --git a/cmd/platform/user.go b/cmd/platform/user.go index e5e068023..0913609f1 100644 --- a/cmd/platform/user.go +++ b/cmd/platform/user.go @@ -184,8 +184,8 @@ func changeUserActiveStatus(a *app.App, user *model.User, userArg string, activa if user == nil { return fmt.Errorf("Can't find user '%v'", userArg) } - if user.IsLDAPUser() { - return errors.New("You can not modify the activation status of AD/LDAP accounts. Please modify through the AD/LDAP server.") + if user.IsSSOUser() { + fmt.Println("You must also deactivate this user in the SSO provider or they will be reactivated on next login or sync.") } if _, err := a.UpdateActive(user, activate); err != nil { return fmt.Errorf("Unable to change activation status of user: %v", userArg) |