From 8861d0cb334a8d27dd8954d071cdad850538cf9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 20 Jan 2020 15:24:14 +0100 Subject: [PATCH] MM-20345: Fixing etag problem not reloading all users when needed (#13640) * MM-20345: Fixing etag problem not reloading all users when needed * Fixing tests --- api4/user.go | 5 ----- api4/user_test.go | 3 --- 2 files changed, 8 deletions(-) diff --git a/api4/user.go b/api4/user.go index bfa9c75a03..60c8cb412d 100644 --- a/api4/user.go +++ b/api4/user.go @@ -605,11 +605,6 @@ func getUsers(c *Context, w http.ResponseWriter, r *http.Request) { profiles, err = c.App.GetUsersInChannelPage(inChannelId, c.Params.Page, c.Params.PerPage, c.IsSystemAdmin()) } } else { - etag = c.App.GetUsersEtag(restrictions.Hash()) - if c.HandleEtag(etag, "Get Users", w, r) { - return - } - userGetOptions, err = c.App.RestrictUsersGetByPermissions(c.App.Session.UserId, userGetOptions) if err != nil { c.Err = err diff --git a/api4/user_test.go b/api4/user_test.go index 7deb221067..2f4079a92d 100644 --- a/api4/user_test.go +++ b/api4/user_test.go @@ -1847,9 +1847,6 @@ func TestGetUsers(t *testing.T) { CheckUserSanitization(t, u) } - rusers, resp = th.Client.GetUsers(0, 60, resp.Etag) - CheckEtag(t, rusers, resp) - rusers, resp = th.Client.GetUsers(0, 1, "") CheckNoError(t, resp) require.Len(t, rusers, 1, "should be 1 per page")