diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-04-19 15:38:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-04-19 15:38:35 -0400 |
| commit | 0b919a324adeebd2f4ef6f250188752176ffe63f (patch) | |
| tree | 367a07677e658518506064d7cb4107516e5e9711 /app/user.go | |
| parent | bc906abd6672efbe9b755a4edd5dbc5f7a39761f (diff) | |
| download | chat-0b919a324adeebd2f4ef6f250188752176ffe63f.tar.gz chat-0b919a324adeebd2f4ef6f250188752176ffe63f.tar.bz2 chat-0b919a324adeebd2f4ef6f250188752176ffe63f.zip | |
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
Diffstat (limited to 'app/user.go')
| -rw-r--r-- | app/user.go | 12 |
1 files changed, 5 insertions, 7 deletions
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) |