From 0b919a324adeebd2f4ef6f250188752176ffe63f Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Wed, 19 Apr 2017 15:38:35 -0400 Subject: Don't sanitize returned user when updating a user (#6095) * Don't sanitize returned user when updating a user * Use user model function for clearing private data --- app/user.go | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'app') diff --git a/app/user.go b/app/user.go index e339dfd5b..827ad18f9 100644 --- a/app/user.go +++ b/app/user.go @@ -942,9 +942,7 @@ func UpdateUserAsUser(user *model.User, asAdmin bool) (*model.User, *model.AppEr return nil, err } - SanitizeProfile(updatedUser, asAdmin) - - sendUpdatedUserEvent(updatedUser) + sendUpdatedUserEvent(*updatedUser, asAdmin) return updatedUser, nil } @@ -962,14 +960,14 @@ func PatchUser(userId string, patch *model.UserPatch, asAdmin bool) (*model.User return nil, err } - SanitizeProfile(updatedUser, asAdmin) - - sendUpdatedUserEvent(updatedUser) + sendUpdatedUserEvent(*updatedUser, asAdmin) return updatedUser, nil } -func sendUpdatedUserEvent(user *model.User) { +func sendUpdatedUserEvent(user model.User, asAdmin bool) { + SanitizeProfile(&user, asAdmin) + omitUsers := make(map[string]bool, 1) omitUsers[user.Id] = true message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_UPDATED, "", "", "", omitUsers) -- cgit v1.2.3-1-g7c22