mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

parseAndWriteAvatar: Do shallow copy before omit() call

Browse source 
Otherwise, we get all prototype props/functions, which we can't save in IndexedDB
This commit is contained in:
Scott Nonnenberg 2018-05-08 16:49:58 -07:00
parent 3bf8a8966a
commit d2293d9592
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/modules/types/contact.js
View file

@ -14,14 +14,18 @@ exports.parseAndWriteAvatar = upgradeAttachment => async (
) => { ) => {
const { message } = context; const { message } = context;
const { avatar } = contact; const { avatar } = contact;
// This is to ensure that an omit() call doesn't pull in prototype props/methods
const contactShallowCopy = Object.assign({}, contact);
const contactWithUpdatedAvatar = const contactWithUpdatedAvatar =
avatar && avatar.avatar avatar && avatar.avatar
? Object.assign({}, contact, { ? Object.assign({}, contactShallowCopy, {
avatar: Object.assign({}, avatar, { avatar: Object.assign({}, avatar, {
avatar: await upgradeAttachment(avatar.avatar, context), avatar: await upgradeAttachment(avatar.avatar, context),
}), }),
}) })
: omit(contact, ['avatar']); : omit(contactShallowCopy, ['avatar']);
// eliminates empty numbers, emails, and addresses; adds type if not provided // eliminates empty numbers, emails, and addresses; adds type if not provided
const parsedContact = parseContact(contactWithUpdatedAvatar); const parsedContact = parseContact(contactWithUpdatedAvatar);