prevent deactivation of sso users (#7759)

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))

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)
 	}