From d35d9484f4918f8f6fc3d48a74ede7eb6db33b7b Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Tue, 16 Jan 2018 13:47:06 -0800
Subject: Allow deactivation of SSO users api3 (#8008)

---
 api/user.go | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'api')

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))
-- 
cgit v1.2.3-1-g7c22