Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/…

…readmessages * 'develop' of github.com:RocketChat/Rocket.Chat: [NEW] Setting to only send plain text emails (#16065) Regression: Fix status bar margins (#16438) [NEW] Check the Omnichannel service status per Department (#16425) [IMPROVE] Show more information related to the Omnichannel room closing data (#16414) Fix index creation for apps_logs collection (#16401) Revert message properties validation (#16395) [FIX] Rooms not being marked as read sometimes (#16397) Update apps engine to 1.12.0-beta.2496 (#16398) [FIX] Container heights (#16388) Regression: App deletion wasn’t returning the correct information (#16360)
RocketChat · Feb 3, 2020 · 6663679 · 6663679
2 parents f1e20b8 + b634bc4
commit 6663679
Show file tree

Hide file tree

Showing 25 changed files with 179 additions and 174 deletions.
diff --git a/app/apps/server/bridges/livechat.js b/app/apps/server/bridges/livechat.js
@@ -12,8 +12,8 @@ export class AppLivechatBridge {
 		this.orch = orch;
 	}
 
-	isOnline() {
-		return Livechat.online();
+	isOnline(department) {
+		return Livechat.online(department);
 	}
 
 	async createMessage(message, appId) {

diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
@@ -15,7 +15,7 @@ export class AppMessageBridge {
 
 		const convertedMessage = this.orch.getConverters().get('messages').convertAppMessage(message);
 
-		const sentMessage = executeSendMessage(convertedMessage.u._id, convertedMessage, true);
+		const sentMessage = executeSendMessage(convertedMessage.u._id, convertedMessage);
 
 		return sentMessage._id;
 	}

diff --git a/app/apps/server/communication/rest.js b/app/apps/server/communication/rest.js
@@ -461,14 +461,12 @@ export class AppsRestApi {
 					return API.v1.notFound(`No App found by the id of: ${ this.urlParams.id }`);
 				}
 
-				manager.remove(prl.getID())
-					.then(() => {
-						const info = prl.getInfo();
-						info.status = prl.getStatus();
-
-						API.v1.success({ app: info });
-					})
-					.catch((err) => API.v1.failure(err));
+				Promise.await(manager.remove(prl.getID()));
+
+				const info = prl.getInfo();
+				info.status = prl.getStatus();
+
+				return API.v1.success({ app: info });
 			},
 		});
 

diff --git a/app/lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js
@@ -8,7 +8,6 @@ import { Apps } from '../../../apps/server';
 import { Markdown } from '../../../markdown/server';
 import { isURL, isRelativeURL } from '../../../utils/lib/isURL';
 import { FileUpload } from '../../../file-upload/server';
-import { Users } from '../../../models/server';
 
 /**
  * IMPORTANT
@@ -144,42 +143,17 @@ const validateMessage = (message) => {
 	}
 };
 
-const validateUserIdentity = (message, _id) => {
-	if (!message.alias && !message.avatar) {
-		return;
-	}
-	const forbiddenPropsToChangeWhenUserIsNotABot = ['avatar'];
-	const user = Users.findOneById(_id, { fields: { roles: 1, name: 1 } });
-	/**
-	 * If the query returns no user, the message has likely
-	 * been sent by a Livechat Visitor, so we don't need to
-	 * validate whether the sender is a bot.
-	 */
-	if (!user) {
-		return;
-	}
-	const userIsNotABot = !user.roles.includes('bot');
-	const messageContainsAnyForbiddenProp = Object.keys(message).some((key) => forbiddenPropsToChangeWhenUserIsNotABot.includes(key));
-	if (userIsNotABot && (messageContainsAnyForbiddenProp || (typeof message.alias !== 'undefined' && message.alias !== user.name))) {
-		throw new Error('You are not authorized to change message properties');
-	}
-};
-
-export const sendMessage = function(user, message, room, upsert = false, trustedSender = false) {
+export const sendMessage = function(user, message, room, upsert = false) {
 	if (!user || !message || !room._id) {
 		return false;
 	}
-	const { _id, username, name } = user;
-
-	if (!trustedSender) {
-		validateUserIdentity(message, _id);
-	}
 
 	validateMessage(message);
 
 	if (!message.ts) {
 		message.ts = new Date();
 	}
+	const { _id, username, name } = user;
 	message.u = {
 		_id,
 		username,

diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js
@@ -15,7 +15,7 @@ import { RateLimiter } from '../lib';
 import { canSendMessage } from '../../../authorization/server';
 import { SystemLogger } from '../../../logger/server';
 
-export function executeSendMessage(uid, message, trustedSender = false) {
+export function executeSendMessage(uid, message) {
 	if (message.tmid && !settings.get('Threads_enabled')) {
 		throw new Meteor.Error('error-not-allowed', 'not-allowed', {
 			method: 'sendMessage',
@@ -73,7 +73,7 @@ export function executeSendMessage(uid, message, trustedSender = false) {
 		}
 
 		metrics.messagesSent.inc(); // TODO This line needs to be moved to it's proper place. See the comments on: https://github.com/RocketChat/Rocket.Chat/pull/5736
-		return sendMessage(user, message, room, false, trustedSender);
+		return sendMessage(user, message, room, false);
 	} catch (error) {
 		if (error === 'error-not-allowed') {
 			throw new Meteor.Error('error-not-allowed');

diff --git a/app/lib/server/startup/email.js b/app/lib/server/startup/email.js
@@ -2,6 +2,10 @@ import { settings } from '../../../settings';
 
 settings.addGroup('Email', function() {
 	this.section('Style', function() {
+		this.add('email_plain_text_only', false, {
+			type: 'boolean',
+		});
+
 		this.add('email_style', `html, body, .body { font-family: -apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Oxygen,Ubuntu,Cantarell,'Helvetica Neue','Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Meiryo UI',Arial,sans-serif; }
 
 	body, .body {
@@ -103,6 +107,10 @@ settings.addGroup('Email', function() {
 			multiline: true,
 			i18nLabel: 'email_style_label',
 			i18nDescription: 'email_style_description',
+			enableQuery: {
+				_id: 'email_plain_text_only',
+				value: false,
+			},
 		});
 	});
 

diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.html b/app/livechat/client/views/app/tabbar/visitorInfo.html
@@ -40,6 +40,7 @@ <h3>{{_ "Conversation"}}</h3>
 						{{#if sms}}<li><i class="i con-mobile"></i>{{_ "SMS_Enabled"}}</li>{{/if}}
 						{{#if topic}}<li><strong>{{_ "Topic"}}</strong>: {{{RocketChatMarkdown topic}}}</li>{{/if}}
 						{{#if tags}}<li><strong>{{_ "Tags"}}</strong>: {{joinTags}}</li>{{/if}}
+						{{#if closedAt}}<li><strong>{{_ "Closed_At"}}</strong>: {{roomClosedDateTime}} <strong>{{_ "by"}}:</strong> {{roomClosedBy}}</li>{{/if}}
 					{{/with}}
 					{{#with department}}
 						{{#if name}}<li><strong>{{_ "Department"}}</strong>: {{name}}</li>{{/if}}

diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
@@ -17,6 +17,7 @@ import { hasRole, hasPermission, hasAtLeastOnePermission } from '../../../../../
 import './visitorInfo.html';
 import { APIClient } from '../../../../../utils/client';
 import { RoomManager } from '../../../../../ui-utils/client';
+import { DateFormat } from '../../../../../lib/client';
 
 const isSubscribedToRoom = () => {
 	const data = Template.currentData();
@@ -198,6 +199,27 @@ Template.visitorInfo.helpers({
 	canForwardGuest() {
 		return hasPermission('transfer-livechat-guest');
 	},
+
+	roomClosedDateTime() {
+		const { closedAt } = this;
+		return DateFormat.formatDateAndTime(closedAt);
+	},
+
+	roomClosedBy() {
+		const { closedBy = {}, servedBy = {} } = this;
+		let { closer } = this;
+
+		if (closer === 'user') {
+			if (servedBy._id !== closedBy._id) {
+				return closedBy.username;
+			}
+
+			closer = 'agent';
+		}
+
+		const closerLabel = closer.charAt(0).toUpperCase() + closer.slice(1);
+		return t(`${ closerLabel }`);
+	},
 });
 
 Template.visitorInfo.events({

diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
@@ -7,8 +7,8 @@ import { Livechat } from '../../lib/Livechat';
 import { callbacks } from '../../../../callbacks/server';
 import { normalizeAgent } from '../../lib/Helper';
 
-export function online() {
-	return Livechat.online();
+export function online(department) {
+	return Livechat.online(department);
 }
 
 export function findTriggers() {

diff --git a/app/livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js
@@ -8,16 +8,16 @@ API.v1.addRoute('livechat/config', {
 		try {
 			check(this.queryParams, {
 				token: Match.Maybe(String),
+				department: Match.Maybe(String),
 			});
 
 			const config = settings();
 			if (!config.enabled) {
 				return API.v1.success({ config: { enabled: false } });
 			}
 
-			const status = online();
-
-			const { token } = this.queryParams;
+			const { token, department } = this.queryParams;
+			const status = online(department);
 			const guest = token && findGuest(token);
 
 			let room;

diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
@@ -50,19 +50,19 @@ export const Livechat = {
 		},
 	}),
 
-	online() {
+	online(department) {
 		if (settings.get('Livechat_accept_chats_with_no_agents')) {
 			return true;
 		}
 
 		if (settings.get('Livechat_assign_new_conversation_to_bot')) {
-			const botAgents = Livechat.getBotAgents();
+			const botAgents = Livechat.getBotAgents(department);
 			if (botAgents && botAgents.count() > 0) {
 				return true;
 			}
 		}
 
-		const onlineAgents = Livechat.getOnlineAgents();
+		const onlineAgents = Livechat.getOnlineAgents(department);
 		return (onlineAgents && onlineAgents.count() > 0) || settings.get('Livechat_accept_chats_with_no_agents');
 	},
 
@@ -355,10 +355,10 @@ export const Livechat = {
 		// Retreive the closed room
 		room = LivechatRooms.findOneByIdOrName(rid);
 
-		sendMessage(user, message, room);
+		sendMessage(user || visitor, message, room);
 
 		if (servedBy) {
-			Subscriptions.hideByRoomIdAndUserId(rid, servedBy._id);
+			Subscriptions.removeByRoomIdAndUserId(rid, servedBy._id);
 		}
 		Messages.createCommandWithRoomIdAndUser('promptTranscript', rid, closeData.closedBy);
 

diff --git a/app/livechat/server/lib/QueueManager.js b/app/livechat/server/lib/QueueManager.js
@@ -9,10 +9,6 @@ import { Livechat } from './Livechat';
 
 export const QueueManager = {
 	async requestRoom({ guest, message, roomInfo, agent }) {
-		if (!Livechat.online()) {
-			throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
-		}
-
 		check(message, Match.ObjectIncluding({
 			rid: String,
 		}));
@@ -23,6 +19,10 @@ export const QueueManager = {
 			department: Match.Maybe(String),
 		}));
 
+		if (!Livechat.online(guest.department)) {
+			throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
+		}
+
 		const { rid } = message;
 		const name = (roomInfo && roomInfo.fname) || guest.name || guest.username;
 

diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js
@@ -50,7 +50,13 @@ export const replaceEscaped = (str, data = {}) => replace(str, {
 		return ret;
 	}, {}),
 });
-export const wrap = (html, data = {}) => replaceEscaped(body.replace('{{body}}', html), data);
+export const wrap = (html, data = {}) => {
+	if (settings.get('email_plain_text_only')) {
+		return replace(html, data);
+	}
+
+	return replaceEscaped(body.replace('{{body}}', html), data);
+};
 export const inlinecss = (html) => juice.inlineContent(html, Settings.get('email_style'));
 export const getTemplate = (template, fn, escape = true) => {
 	let html = '';
@@ -103,6 +109,10 @@ export const sendNoWrap = ({ to, from, replyTo, subject, html, text, headers })
 		text = stripHtml(html);
 	}
 
+	if (settings.get('email_plain_text_only')) {
+		html = undefined;
+	}
+
 	Meteor.defer(() => Email.send({ to, from, replyTo, subject, html, text, headers }));
 };
 

diff --git a/app/models/server/models/_Base.js b/app/models/server/models/_Base.js
@@ -7,8 +7,8 @@ import { BaseDb } from './_BaseDb';
 import { oplogEvents } from '../oplogEvents';
 
 export class Base {
-	constructor(nameOrModel) {
-		this._db = new BaseDb(nameOrModel, this);
+	constructor(nameOrModel, options) {
+		this._db = new BaseDb(nameOrModel, this, options);
 		this.model = this._db.model;
 		this.collectionName = this._db.collectionName;
 		this.name = this._db.name;

diff --git a/app/models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js
@@ -18,7 +18,7 @@ try {
 }
 
 export class BaseDb extends EventEmitter {
-	constructor(model, baseModel) {
+	constructor(model, baseModel, options = {}) {
 		super();
 
 		if (Match.test(model, String)) {
@@ -68,7 +68,7 @@ export class BaseDb extends EventEmitter {
 		};
 		this.on('newListener', handleListener);
 
-		this.tryEnsureIndex({ _updatedAt: 1 });
+		this.tryEnsureIndex({ _updatedAt: 1 }, options._updatedAtIndexOptions);
 	}
 
 	get baseName() {

diff --git a/app/models/server/models/apps-logs-model.js b/app/models/server/models/apps-logs-model.js
@@ -2,10 +2,9 @@ import { Base } from './_Base';
 
 export class AppsLogsModel extends Base {
 	constructor() {
-		super('apps_logs');
+		super('apps_logs', { _updatedAtIndexOptions: { expireAfterSeconds: 60 * 60 * 24 * 30 } });
 
 		this.tryEnsureIndex({ appId: 1 });
-		this.tryEnsureIndex({ _updatedAt: 1 }, { expireAfterSeconds: 60 * 60 * 24 * 30 });
 	}
 
 	// Bypass trash collection

diff --git a/app/theme/client/imports/general/base.css b/app/theme/client/imports/general/base.css
@@ -87,6 +87,8 @@ button {
 
 	display: flex;
 
+	overflow: hidden;
+
 	flex: 1 1 auto;
 
 	height: 100%;

diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
@@ -157,6 +157,7 @@
 	top: 0;
 
 	width: 100%;
+	margin-top: 0 !important;
 	padding: 2px;
 
 	border-width: 0 0 1px;

diff --git a/app/ui-utils/client/lib/readMessages.js b/app/ui-utils/client/lib/readMessages.js
@@ -1,6 +1,5 @@
 import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
-import _ from 'underscore';
 import EventEmitter from 'wolfy87-eventemitter';
 
 import { RoomHistoryManager } from './RoomHistoryManager';
@@ -23,7 +22,6 @@ export const readMessage = new class extends EventEmitter {
 	constructor() {
 		super();
 		this.debug = false;
-		// this.read = this.readNow;
 		this.enable();
 	}