Skip to content
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

Jump to bottom

[FIX] Missing user data on files uploaded through the API #10473

Merged
merged 5 commits into from
Apr 20, 2018
Merged

[FIX] Missing user data on files uploaded through the API #10473

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
313ded0
Added missing userId
Hudell Apr 16, 2018
0a2e18b
Fixed roomFiles method to return files without users too
Hudell Apr 16, 2018
4d67132
Merge branch 'develop' into missing-userid-on-api-uploaded-files
Hudell Apr 20, 2018
979fa77
Added migration to add userId on orphan files
Hudell Apr 20, 2018
703adca
Changed migration code to make sure the message exist before trying t…
Hudell Apr 20, 2018
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
3 changes: 2 additions & 1 deletion packages/rocketchat-api/server/v1/rooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ RocketChat.API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
name: file.filename,
size: file.fileBuffer.length,
type: file.mimetype,
rid: this.urlParams.rid
rid: this.urlParams.rid,
userId: this.userId
};

Meteor.runAsUser(this.userId, () => {
Expand Down
4 changes: 2 additions & 2 deletions server/publications/roomFiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ Meteor.publish('roomFiles', function(rid, limit = 50) {

const cursorFileListHandle = RocketChat.models.Uploads.findNotHiddenFilesOfRoom(rid, limit).observeChanges({
added(_id, record) {
const {username, name} = RocketChat.models.Users.findOneById(record.userId);
const {username, name} = record.userId ? RocketChat.models.Users.findOneById(record.userId) : {};
return pub.added('room_files', _id, {...record, user:{username, name}});
},
changed(_id, record) {
const {username, name} = RocketChat.models.Users.findOneById(record.userId);
const {username, name} = record.userId ? RocketChat.models.Users.findOneById(record.userId) : {};
return pub.changed('room_files', _id, {...record, user:{username, name}});
},
removed(_id, record) {
Expand Down
29 changes: 29 additions & 0 deletions server/startup/migrations/v113.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
RocketChat.Migrations.add({
version: 113,
up() {
if (RocketChat && RocketChat.models && RocketChat.models.Uploads && RocketChat.models.Messages) {
const fileQuery = {
userId: null
};

const filesToUpdate = RocketChat.models.Uploads.find(fileQuery);
filesToUpdate.forEach((file) => {
const messageQuery = {
'file._id' : file._id
};
const message = RocketChat.models.Messages.findOne(messageQuery);
const filter = {
_id: file._id
};

const update = {
$set: {
userId: message.u._id
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you test if the message's object exists to prevent an exception here?

}
};

RocketChat.models.Uploads.model.direct.update(filter, update);
});
}
}
});