Fix: chat.react api not accepting previous emojis (#10290)

* Fix the chat.react api being invalid * Remove duplicated code * Add tests for chat.react endpoint
RocketChat · Apr 3, 2018 · 0afab32 · 0afab32
1 parent 7145112
commit 0afab32
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/packages/rocketchat-api/server/v1/chat.js b/packages/rocketchat-api/server/v1/chat.js
@@ -267,7 +267,11 @@ RocketChat.API.v1.addRoute('chat.react', { authRequired: true }, {
 			throw new Meteor.Error('error-message-not-found', 'The provided "messageId" does not match any existing message.');
 		}
 
-		const emoji = this.bodyParams.emoji;
+		const emoji = this.bodyParams.emoji || this.bodyParams.reaction;
+
+		if (!emoji) {
+			throw new Meteor.Error('error-emoji-param-not-provided', 'The required "emoji" param is missing.');
+		}
 
 		Meteor.runAsUser(this.userId, () => Meteor.call('setReaction', emoji, msg._id));
 

diff --git a/packages/rocketchat-reactions/setReaction.js b/packages/rocketchat-reactions/setReaction.js
@@ -19,6 +19,8 @@ Meteor.methods({
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'setReaction' });
 		}
 
+		reaction = `:${ reaction.replace(/:/g, '') }:`;
+
 		if (!RocketChat.emoji.list[reaction] && RocketChat.models.EmojiCustom.findByNameOrAlias(reaction).count() === 0) {
 			throw new Meteor.Error('error-not-allowed', 'Invalid emoji provided.', { method: 'setReaction' });
 		}
@@ -37,8 +39,6 @@ Meteor.methods({
 			return false;
 		}
 
-		reaction = `:${ reaction.replace(/:/g, '') }:`;
-
 		if (message.reactions && message.reactions[reaction] && message.reactions[reaction].usernames.indexOf(user.username) !== -1) {
 			message.reactions[reaction].usernames.splice(message.reactions[reaction].usernames.indexOf(user.username), 1);
 

diff --git a/tests/end-to-end/api/05-chat.js b/tests/end-to-end/api/05-chat.js
@@ -193,6 +193,36 @@ describe('[Chat]', function() {
 				})
 				.end(done);
 		});
+
+		it('should return statusCode: 200 when the emoji is valid and has no colons', (done) => {
+			request.post(api('chat.react'))
+				.set(credentials)
+				.send({
+					emoji: 'bee',
+					messageId: message._id
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+				})
+				.end(done);
+		});
+
+		it('should return statusCode: 200 for reaction property when the emoji is valid', (done) => {
+			request.post(api('chat.react'))
+				.set(credentials)
+				.send({
+					reaction: 'ant',
+					messageId: message._id
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+				})
+				.end(done);
+		});
 	});
 
 	describe('[/chat.getMessageReadReceipts]', () => {