Sanitize user in update user response (#24362)
Этот коммит содержится в:
@@ -1285,6 +1285,8 @@ func (a *App) UpdateUser(c request.CTX, user *model.User, sendNotifications bool
|
|||||||
}(user.Id)
|
}(user.Id)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
newUser.Sanitize(map[string]bool{})
|
||||||
|
|
||||||
return newUser, nil
|
return newUser, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -205,6 +205,7 @@ func TestUpdateUser(t *testing.T) {
|
|||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
require.NotNil(t, u)
|
require.NotNil(t, u)
|
||||||
require.Less(t, u.LastPictureUpdate, iLastPictureUpdate)
|
require.Less(t, u.LastPictureUpdate, iLastPictureUpdate)
|
||||||
|
require.Empty(t, u.Password)
|
||||||
})
|
})
|
||||||
|
|
||||||
t.Run("fails if profile picture is updated when user has custom profile picture and username is changed", func(t *testing.T) {
|
t.Run("fails if profile picture is updated when user has custom profile picture and username is changed", func(t *testing.T) {
|
||||||
@@ -1731,11 +1732,12 @@ func TestPatchUser(t *testing.T) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
t.Run("Patch username with a new username", func(t *testing.T) {
|
t.Run("Patch username with a new username", func(t *testing.T) {
|
||||||
_, err := th.App.PatchUser(th.Context, testUser.Id, &model.UserPatch{
|
u, err := th.App.PatchUser(th.Context, testUser.Id, &model.UserPatch{
|
||||||
Username: model.NewString(model.NewId()),
|
Username: model.NewString(model.NewId()),
|
||||||
}, true)
|
}, true)
|
||||||
|
|
||||||
require.Nil(t, err)
|
require.Nil(t, err)
|
||||||
|
require.Empty(t, u.Password)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user