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

…pinned_messages_collapse

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [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)
  [BREAK] Remove deprecated publications (#16351)

app/api/server/v1/misc.js

@@ -10,7 +10,7 @@ import { settings } from '../../../settings/server';
 import { API } from '../api';
 import { getDefaultUserFields } from '../../../utils/server/functions/getDefaultUserFields';
 import { getURL } from '../../../utils/lib/getURL';
-import { StdOut } from '../../../logger/server/publish';
+import { StdOut } from '../../../logger/server/streamer';
 
 
 // DEPRECATED

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) {

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

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

app/authorization/server/index.js

@@ -20,8 +20,7 @@ import './methods/deleteRole';
 import './methods/removeRoleFromPermission';
 import './methods/removeUserFromRole';
 import './methods/saveRole';
-import './publications/permissions';
-import './publications/roles';
+import './streamer/permissions';
 import './startup';
 
 export {

app/authorization/server/startup.js

@@ -4,6 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import { Roles, Permissions, Settings } from '../../models';
 import { settings } from '../../settings/server';
 import { getSettingPermissionId, CONSTANTS } from '../lib';
+import { clearCache } from './functions/hasPermission';
 
 Meteor.startup(function() {
 	// Note:
@@ -208,4 +209,12 @@ Meteor.startup(function() {
 	};
 
 	settings.onload('*', createPermissionForAddedSetting);
+
+	Roles.on('change', ({ diff }) => {
+		if (diff && Object.keys(diff).length === 1 && diff._updatedAt) {
+			// avoid useless changes
+			return;
+		}
+		clearCache();
+	});
 });

app/custom-sounds/server/index.js

@@ -5,4 +5,3 @@ import './methods/deleteCustomSound';
 import './methods/insertOrUpdateSound';
 import './methods/listCustomSounds';
 import './methods/uploadCustomSound';
-import './publications/customSounds';

app/discussion/server/index.js

@@ -3,8 +3,6 @@ import './authorization';
 import './permissions';
 
 import './hooks/propagateDiscussionMetadata';
-import './publications/discussionParentAutocomplete';
-import './publications/discussionsOfRoom';
 
 // Methods
 import './methods/createDiscussion';

app/emoji-custom/server/index.js

@@ -1,6 +1,5 @@
 import './startup/emoji-custom';
 import './startup/settings';
-import './publications/fullEmojiData';
 import './methods/listEmojiCustom';
 import './methods/deleteEmojiCustom';
 import './methods/insertOrUpdateEmoji';

app/integrations/server/index.js

@@ -1,8 +1,6 @@
 import '../lib/rocketchat';
 import './logger';
 import './lib/validation';
-import './publications/integrations';
-import './publications/integrationHistory';
 import './methods/incoming/addIncomingIntegration';
 import './methods/incoming/updateIncomingIntegration';
 import './methods/incoming/deleteIncomingIntegration';

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,

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