summaryrefslogtreecommitdiffstats
path: root/cmd/platform
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-12-08 14:14:55 -0500
committerChristopher Speller <crspeller@gmail.com>2017-12-08 11:14:55 -0800
commit617a98d6d8a48e347921bdcaa5155b4022174d87 (patch)
treeaefb864af543e816621e0f4a9bcacd523c9fce89 /cmd/platform
parentae931ae6b63047d3a5362ab217ebdcf4ecaa6cb8 (diff)
downloadchat-617a98d6d8a48e347921bdcaa5155b4022174d87.tar.gz
chat-617a98d6d8a48e347921bdcaa5155b4022174d87.tar.bz2
chat-617a98d6d8a48e347921bdcaa5155b4022174d87.zip
Allow deactivation of SSO users (#7952)
Diffstat (limited to 'cmd/platform')
-rw-r--r--cmd/platform/user.go4
1 files changed, 2 insertions, 2 deletions
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)