[FIX] Opening a Livechat room from another agent (#13951)

RocketChat · Apr 2, 2019 · 727170e · 727170e
1 parent 982ed73
commit 727170e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
@@ -7,7 +7,7 @@ import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 
 Meteor.startup(() => {
-	roomTypes.setRoomFind('l', (_id) => Rooms.findLivechatById(_id).fetch());
+	roomTypes.setRoomFind('l', (_id) => Rooms.findOneLivechatById(_id));
 
 	addRoomAccessValidator(function(room, user) {
 		return room && room.t === 'l' && user && hasPermission(user._id, 'view-livechat-rooms');

diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
@@ -94,6 +94,21 @@ export class Rooms extends Base {
 		return this.find(query, options);
 	}
 
+	findOneLivechatById(_id, fields) {
+		const options = {};
+
+		if (fields) {
+			options.fields = fields;
+		}
+
+		const query = {
+			t: 'l',
+			_id,
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findLivechatByIdAndVisitorToken(_id, visitorToken, fields) {
 		const options = {};