Merge pull request #9393 from RocketChat/livechat-fix-impersonated-agent

[FIX] Fix incoming livechat when impersonating an agent
RocketChat · Jan 17, 2018 · 9596def · 9596def
2 parents ec46ebd + b669614
commit 9596def
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/rocketchat-livechat/.app/client/lib/chatMessages.js b/packages/rocketchat-livechat/.app/client/lib/chatMessages.js
@@ -116,7 +116,7 @@ this.ChatMessages = class ChatMessages {
 			const currentAgent = !visitor.roomSubscribed && Livechat.agent;
 			if (currentAgent) {
 				agent = {
-					_id: currentAgent._id,
+					agentId: currentAgent._id,
 					username: currentAgent.username
 				};
 			}

diff --git a/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js b/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js
@@ -7,6 +7,11 @@ Meteor.methods({
 		check(rid, String);
 		check(msg, String);
 
+		check(agent, Match.Maybe({
+			agentId: String,
+			username: String
+		}));
+
 		const guest = LivechatVisitors.getVisitorByToken(token, {
 			fields: {
 				name: 1,