From 9d32cd42085bbb37460d815c6c1a00ad881c4895 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 2 Nov 2017 16:24:11 -0500 Subject: prevent deactivation of sso users (#7759) --- api4/user.go | 2 +- api4/user_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'api4') diff --git a/api4/user.go b/api4/user.go index 7343ce326..16b7f79a9 100644 --- a/api4/user.go +++ b/api4/user.go @@ -683,7 +683,7 @@ func updateUserActive(c *Context, w http.ResponseWriter, r *http.Request) { return } - if ruser, err := c.App.UpdateActiveNoLdap(c.Params.UserId, active); err != nil { + if ruser, err := c.App.UpdateNonSSOUserActive(c.Params.UserId, active); err != nil { c.Err = err } else { c.LogAuditWithUserId(ruser.Id, fmt.Sprintf("active=%v", active)) diff --git a/api4/user_test.go b/api4/user_test.go index 98f88ab64..d2bbdcd7b 100644 --- a/api4/user_test.go +++ b/api4/user_test.go @@ -521,7 +521,7 @@ func TestSearchUsers(t *testing.T) { t.Fatal("should have found user") } - _, err := th.App.UpdateActiveNoLdap(th.BasicUser2.Id, false) + _, err := th.App.UpdateNonSSOUserActive(th.BasicUser2.Id, false) if err != nil { t.Fatal(err) } @@ -638,7 +638,7 @@ func TestSearchUsers(t *testing.T) { th.App.UpdateConfig(func(cfg *model.Config) { cfg.PrivacySettings.ShowEmailAddress = false }) th.App.UpdateConfig(func(cfg *model.Config) { cfg.PrivacySettings.ShowFullName = false }) - _, err = th.App.UpdateActiveNoLdap(th.BasicUser2.Id, true) + _, err = th.App.UpdateNonSSOUserActive(th.BasicUser2.Id, true) if err != nil { t.Fatal(err) } -- cgit v1.2.3-1-g7c22