From f86492387d432c529e81e7ab02eb299725c9a67e Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Tue, 10 Jan 2017 15:51:44 -0200 Subject: [PATCH] Return user object on method getUserFromParams --- packages/rocketchat-api/server/v1/channels.js | 12 ++++++------ packages/rocketchat-api/server/v1/groups.js | 12 ++++++------ .../server/v1/helpers/getUserFromParams.js | 4 +--- packages/rocketchat-api/server/v1/users.js | 6 +++--- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/packages/rocketchat-api/server/v1/channels.js b/packages/rocketchat-api/server/v1/channels.js index 029399fb6e3..241a26f832e 100644 --- a/packages/rocketchat-api/server/v1/channels.js +++ b/packages/rocketchat-api/server/v1/channels.js @@ -43,7 +43,7 @@ RocketChat.API.v1.addRoute('channels.addModerator', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('addRoomModerator', findResult._id, user._id); @@ -61,7 +61,7 @@ RocketChat.API.v1.addRoute('channels.addOwner', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('addRoomOwner', findResult._id, user._id); @@ -320,7 +320,7 @@ RocketChat.API.v1.addRoute('channels.invite', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('addUserToRoom', { rid: findResult._id, username: user.username }); @@ -358,7 +358,7 @@ RocketChat.API.v1.addRoute('channels.kick', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('removeUserFromRoom', { rid: findResult._id, username: user.username }); @@ -471,7 +471,7 @@ RocketChat.API.v1.addRoute('channels.removeModerator', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('removeRoomModerator', findResult._id, user._id); @@ -489,7 +489,7 @@ RocketChat.API.v1.addRoute('channels.removeOwner', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('removeRoomOwner', findResult._id, user._id); diff --git a/packages/rocketchat-api/server/v1/groups.js b/packages/rocketchat-api/server/v1/groups.js index 15801a3e51e..abef31491b2 100644 --- a/packages/rocketchat-api/server/v1/groups.js +++ b/packages/rocketchat-api/server/v1/groups.js @@ -25,7 +25,7 @@ RocketChat.API.v1.addRoute('groups.addModerator', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('addRoomModerator', findResult.rid, user._id); @@ -43,7 +43,7 @@ RocketChat.API.v1.addRoute('groups.addOwner', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('addRoomOwner', findResult.rid, user._id); @@ -249,7 +249,7 @@ RocketChat.API.v1.addRoute('groups.invite', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('addUserToRoom', { rid: findResult.rid, username: user.username }); @@ -270,7 +270,7 @@ RocketChat.API.v1.addRoute('groups.kick', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('removeUserFromRoom', { rid: findResult.rid, username: user.username }); @@ -350,7 +350,7 @@ RocketChat.API.v1.addRoute('groups.removeModerator', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('removeRoomModerator', findResult.rid, user._id); @@ -368,7 +368,7 @@ RocketChat.API.v1.addRoute('groups.removeOwner', { authRequired: true }, { return findResult; } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('removeRoomOwner', findResult.rid, user._id); diff --git a/packages/rocketchat-api/server/v1/helpers/getUserFromParams.js b/packages/rocketchat-api/server/v1/helpers/getUserFromParams.js index 74ec05b289c..8774549a7e1 100644 --- a/packages/rocketchat-api/server/v1/helpers/getUserFromParams.js +++ b/packages/rocketchat-api/server/v1/helpers/getUserFromParams.js @@ -31,7 +31,5 @@ RocketChat.API.v1.helperMethods.set('getUserFromParams', function _getUserFromPa throw new Meteor.Error('error-invalid-user', 'The required "userId" or "username" param provided does not match any users'); } - return { - user - }; + return user; }); diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js index c809023de60..151effe1d7a 100644 --- a/packages/rocketchat-api/server/v1/users.js +++ b/packages/rocketchat-api/server/v1/users.js @@ -41,7 +41,7 @@ RocketChat.API.v1.addRoute('users.delete', { authRequired: true }, { return RocketChat.API.v1.unauthorized(); } - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); Meteor.runAsUser(this.userId, () => { Meteor.call('deleteUser', user._id); @@ -55,7 +55,7 @@ RocketChat.API.v1.addRoute('users.getPresence', { authRequired: true }, { get: function() { //BLAHHHHHHHHHH :'( if ((this.queryParams.userId && this.userId !== this.queryParams.userId) || (this.queryParams.username && this.user.username !== this.queryParams.username) || (this.queryParams.user && this.user.username !== this.queryParams.user)) { - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); return RocketChat.API.v1.success({ presence: user.status @@ -73,7 +73,7 @@ RocketChat.API.v1.addRoute('users.getPresence', { authRequired: true }, { RocketChat.API.v1.addRoute('users.info', { authRequired: true }, { get: function() { - const { user } = this.getUserFromParams(); + const user = this.getUserFromParams(); let result; Meteor.runAsUser(this.userId, () => {