From 617a98d6d8a48e347921bdcaa5155b4022174d87 Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 8 Dec 2017 14:14:55 -0500 Subject: Allow deactivation of SSO users (#7952) --- cmd/platform/user.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/platform') 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) -- cgit v1.2.3-1-g7c22