Skip to content

[FIX] Data converters overriding fields added by apps #16639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ggazzo merged 6 commits into from
Feb 19, 2020
Merged

[FIX] Data converters overriding fields added by apps #16639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
27c3a1a
fix app engine block
ggazzo Feb 18, 2020
bee96dc
fix app engine block
ggazzo Feb 18, 2020
ea97ca6
Merge branch 'fix/appengine-converter' of github.com:RocketChat/Rocke…
d-gubert Feb 18, 2020
5574891
Fix data mapping algorithm
d-gubert Feb 18, 2020
7335757
Update app/lib/server/functions/sendMessage.js
d-gubert Feb 18, 2020
b27e179
Remove debugging
d-gubert Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/apps/lib/misc/transformMappedData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,10 @@ export const transformMappedData = (data, map) => {
if (typeof result !== 'undefined') {
transformedData[to] = result;
}
} else if (typeof from === 'string' && typeof originalData[from] !== 'undefined') {
transformedData[to] = originalData[from];
} else if (typeof from === 'string') {
if (typeof originalData[from] !== 'undefined') {
transformedData[to] = originalData[from];
}
delete originalData[from];
}
});
Expand Down
1 change: 1 addition & 0 deletions app/lib/server/functions/sendMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ const validateMessage = (message) => {
emoji: String,
avatar: ValidPartialURLParam,
attachments: [Match.Any],
blocks: [Match.Any],
}));

if (Array.isArray(message.attachments) && message.attachments.length) {
Expand Down