apitech
/
Rocket.Chat
mirror of https://github.com/RocketChat/Rocket.Chat
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Return user object on method getUserFromParams

Browse Source
pull/5411/head
Rodrigo Nascimento 8 years ago
parent 4ef69719f4
commit f86492387d
No known key found for this signature in database
GPG Key ID: 2C85B3AFE75D23F9
4 changed files with 16 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 12
      packages/rocketchat-api/server/v1/channels.js
  2. 12
      packages/rocketchat-api/server/v1/groups.js
  3. 4
      packages/rocketchat-api/server/v1/helpers/getUserFromParams.js
  4. 6
      packages/rocketchat-api/server/v1/users.js

12
packages/rocketchat-api/server/v1/channels.js
Unescape View File

@ -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);

12
packages/rocketchat-api/server/v1/groups.js
Unescape View File

@ -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);

4
packages/rocketchat-api/server/v1/helpers/getUserFromParams.js
Unescape View File

@ -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;
});

6
packages/rocketchat-api/server/v1/users.js
Unescape View File

@ -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, () => {

Write Preview
Loading…
Cancel
Save