diff options
| author | Chris Duarte <csduarte@users.noreply.github.com> | 2018-01-16 13:47:06 -0800 |
|---|---|---|
| committer | Chris <ccbrown112@gmail.com> | 2018-01-16 15:47:06 -0600 |
| commit | d35d9484f4918f8f6fc3d48a74ede7eb6db33b7b (patch) | |
| tree | 4cfd3026bbeeb59e0e13795f30111d96f036673a | |
| parent | 2fa7c464f019f67c5c0494aaf5ac0f5ecc1ee7a7 (diff) | |
| download | chat-d35d9484f4918f8f6fc3d48a74ede7eb6db33b7b.tar.gz chat-d35d9484f4918f8f6fc3d48a74ede7eb6db33b7b.tar.bz2 chat-d35d9484f4918f8f6fc3d48a74ede7eb6db33b7b.zip | |
Allow deactivation of SSO users api3 (#8008)
| -rw-r--r-- | api/user.go | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/api/user.go b/api/user.go index 55042498a..ae8a6cab6 100644 --- a/api/user.go +++ b/api/user.go @@ -727,7 +727,15 @@ func updateActive(c *Context, w http.ResponseWriter, r *http.Request) { return } - if ruser, err := c.App.UpdateNonSSOUserActive(userId, active); err != nil { + var ruser *model.User + var err *model.AppError + + if ruser, err = c.App.GetUser(userId); err != nil { + c.Err = err + return + } + + if _, err := c.App.UpdateActive(ruser, active); err != nil { c.Err = err } else { c.LogAuditWithUserId(ruser.Id, fmt.Sprintf("active=%v", active)) |