Skip to content

[FIX] Add user object to responses in /*.files Rest endpoints #10480

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
rodrigok merged 1 commit into from
Apr 20, 2018
Merged

[FIX] Add user object to responses in /*.files Rest endpoints #10480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages/rocketchat-api/package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ Package.onUse(function(api) {
api.addFiles('server/helpers/parseJsonQuery.js', 'server');
api.addFiles('server/helpers/deprecationWarning.js', 'server');
api.addFiles('server/helpers/getLoggedInUser.js', 'server');
api.addFiles('server/helpers/insertUserObject.js', 'server');

//Add default routes
api.addFiles('server/default/info.js', 'server');
Expand Down
12 changes: 12 additions & 0 deletions packages/rocketchat-api/server/helpers/insertUserObject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
RocketChat.API.helperMethods.set('insertUserObject', function _addUserToObject({ object, userId }) {
const { username, name } = RocketChat.models.Users.findOneById(userId);

object.user = {
_id: userId,
username,
name
};

return object;
});

11 changes: 9 additions & 2 deletions packages/rocketchat-api/server/v1/channels.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@ RocketChat.API.v1.addRoute('channels.delete', { authRequired: true }, {
RocketChat.API.v1.addRoute('channels.files', { authRequired: true }, {
get() {
const findResult = findChannelByIdOrName({ params: this.requestParams(), checkedArchived: false });
const addUserObjectToEveryObject = (file) => {
if (file.userId) {
file = this.insertUserObject({ object: file, userId: file.userId });
}
return file;
};

Meteor.runAsUser(this.userId, () => {
Meteor.call('canAccessRoom', findResult._id, this.userId);
Expand All @@ -247,8 +253,9 @@ RocketChat.API.v1.addRoute('channels.files', { authRequired: true }, {
}).fetch();

return RocketChat.API.v1.success({
files,
count: files.length,
files: files.map(addUserObjectToEveryObject),
count:
files.length,
offset,
total: RocketChat.models.Uploads.find(ourQuery).count()
});
Expand Down
8 changes: 7 additions & 1 deletion packages/rocketchat-api/server/v1/groups.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ RocketChat.API.v1.addRoute('groups.delete', { authRequired: true }, {
RocketChat.API.v1.addRoute('groups.files', { authRequired: true }, {
get() {
const findResult = findPrivateGroupByIdOrName({ params: this.requestParams(), userId: this.userId, checkedArchived: false });
const addUserObjectToEveryObject = (file) => {
if (file.userId) {
file = this.insertUserObject({ object: file, userId: file.userId });
}
return file;
};

const { offset, count } = this.getPaginationItems();
const { sort, fields, query } = this.parseJsonQuery();
Expand All @@ -173,7 +179,7 @@ RocketChat.API.v1.addRoute('groups.files', { authRequired: true }, {
}).fetch();

return RocketChat.API.v1.success({
files,
files: files.map(addUserObjectToEveryObject),
count: files.length,
offset,
total: RocketChat.models.Uploads.find(ourQuery).count()
Expand Down
8 changes: 7 additions & 1 deletion packages/rocketchat-api/server/v1/im.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@ RocketChat.API.v1.addRoute(['dm.close', 'im.close'], { authRequired: true }, {
RocketChat.API.v1.addRoute(['dm.files', 'im.files'], { authRequired: true }, {
get() {
const findResult = findDirectMessageRoom(this.requestParams(), this.user);
const addUserObjectToEveryObject = (file) => {
if (file.userId) {
file = this.insertUserObject({ object: file, userId: file.userId });
}
return file;
};

const { offset, count } = this.getPaginationItems();
const { sort, fields, query } = this.parseJsonQuery();
Expand All @@ -66,7 +72,7 @@ RocketChat.API.v1.addRoute(['dm.files', 'im.files'], { authRequired: true }, {
}).fetch();

return RocketChat.API.v1.success({
files,
files: files.map(addUserObjectToEveryObject),
count: files.length,
offset,
total: RocketChat.models.Uploads.find(ourQuery).count()
Expand Down