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

…apps_rewrite * 'develop' of github.com:RocketChat/Rocket.Chat: (30 commits) Regression: Fix Unread bar design (#17750) Regression: Adjusting spaces between OAuth login buttons (#17745) Improved thread margins for clarity Regression: Scroll on admin user info (#17711) Regression: Removed status border on mentions list (#17741) Regression: Force unread-rooms bar to appears over the room list (#17728) [NEW][APPS-ENGINE] Essentials mechanism (#17656) Regression: Fix error preventing creation of group DMs (#17726) [FIX] SAML IDP initiated logout error (#17482) Regression: Threads list was fetching all threads (#17716) Regression: Add missing return to afterSaveMessage callbacks (#17715) [FIX] Missing dropdown to select custom status color on user's profile (#16537) [FIX] Password reset/change accepting current password as new password (#16331) [NEW][ENTERPRISE] Support Omnichannel conversations auditing (#17692) Upgrade Livechat Widget version to 1.5.0 (#17710) [FIX] Can't click on room's actions menu of sidebar list when in search mode (#16548) [NEW][ENTERPRISE] Support for custom Livechat registration form fields (#17581) Update Fuselage version (#17708) [NEW][ENTERPRISE] Omnichannel Last-Chatted Agent Preferred option (#17666) Regression: Status presence color (#17707) ...
RocketChat · May 28, 2020 · b152498 · b152498
2 parents 3bed47b + 0d2723f
commit b152498
Show file tree

Hide file tree

Showing 180 changed files with 1,354 additions and 698 deletions.
diff --git a/app/accounts/index.js b/app/accounts/index.js
diff --git a/app/action-links/client/index.js b/app/action-links/client/index.js
@@ -1,5 +1,4 @@
-import { actionLinks } from '../both/lib/actionLinks';
-import './lib/actionLinks';
+import { actionLinks } from './lib/actionLinks';
 import './init';
 import './stylesheets/actionLinks.css';
 

diff --git a/app/action-links/client/init.js b/app/action-links/client/init.js
@@ -1,14 +1,14 @@
 import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
 
-import { handleError } from '../../utils';
-import { fireGlobalEvent, Layout } from '../../ui-utils';
+import { handleError } from '../../utils/client';
+import { fireGlobalEvent, Layout } from '../../ui-utils/client';
 import { messageArgs } from '../../ui-utils/client/lib/messageArgs';
-import { actionLinks } from '../both/lib/actionLinks';
+import { actionLinks } from './lib/actionLinks';
 
 
 Template.room.events({
-	'click .action-link'(event, instance) {
+	'click [data-actionlink]'(event, instance) {
 		event.preventDefault();
 		event.stopPropagation();
 

diff --git a/app/action-links/client/lib/actionLinks.js b/app/action-links/client/lib/actionLinks.js
@@ -1,27 +1,58 @@
 import { Meteor } from 'meteor/meteor';
 
-import { handleError } from '../../../utils';
-import { actionLinks } from '../../both/lib/actionLinks';
-// Action Links Handler. This method will be called off the client.
+import { handleError } from '../../../utils/client';
+import { Messages, Subscriptions } from '../../../models/client';
 
-actionLinks.run = (name, messageId, instance) => {
-	const message = actionLinks.getMessage(name, messageId);
+// Action Links namespace creation.
+export const actionLinks = {
+	actions: {},
+	register(name, funct) {
+		actionLinks.actions[name] = funct;
+	},
+	getMessage(name, messageId) {
+		const userId = Meteor.userId();
+		if (!userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { function: 'actionLinks.getMessage' });
+		}
+
+		const message = Messages.findOne({ _id: messageId });
+		if (!message) {
+			throw new Meteor.Error('error-invalid-message', 'Invalid message', { function: 'actionLinks.getMessage' });
+		}
+
+		const subscription = Subscriptions.findOne({
+			rid: message.rid,
+			'u._id': userId,
+		});
+		if (!subscription) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { function: 'actionLinks.getMessage' });
+		}
+
+		if (!message.actionLinks || !message.actionLinks[name]) {
+			throw new Meteor.Error('error-invalid-actionlink', 'Invalid action link', { function: 'actionLinks.getMessage' });
+		}
 
-	const actionLink = message.actionLinks[name];
+		return message;
+	},
+	run(name, messageId, instance) {
+		const message = actionLinks.getMessage(name, messageId);
 
-	let ranClient = false;
+		const actionLink = message.actionLinks[name];
 
-	if (actionLinks && actionLinks.actions && actionLinks.actions[actionLink.method_id]) {
-		// run just on client side
-		actionLinks.actions[actionLink.method_id](message, actionLink.params, instance);
+		let ranClient = false;
 
-		ranClient = true;
-	}
+		if (actionLinks && actionLinks.actions && actionLinks.actions[actionLink.method_id]) {
+			// run just on client side
+			actionLinks.actions[actionLink.method_id](message, actionLink.params, instance);
 
-	// and run on server side
-	Meteor.call('actionLinkHandler', name, messageId, (err) => {
-		if (err && !ranClient) {
-			handleError(err);
+			ranClient = true;
 		}
-	});
+
+		// and run on server side
+		Meteor.call('actionLinkHandler', name, messageId, (err) => {
+			if (err && !ranClient) {
+				handleError(err);
+			}
+		});
+	},
 };
diff --git a/app/action-links/index.js b/app/action-links/index.js
diff --git a/app/action-links/server/actionLinkHandler.js b/app/action-links/server/actionLinkHandler.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { actionLinks } from '../both/lib/actionLinks';
+import { actionLinks } from './lib/actionLinks';
 // Action Links Handler. This method will be called off the client.
 
 Meteor.methods({

diff --git a/app/action-links/server/index.js b/app/action-links/server/index.js
@@ -1,4 +1,4 @@
-import { actionLinks } from '../both/lib/actionLinks';
+import { actionLinks } from './lib/actionLinks';
 import './actionLinkHandler';
 
 export {

diff --git a/app/action-links/both/lib/actionLinks.js → app/action-links/server/lib/actionLinks.js b/app/action-links/both/lib/actionLinks.js → app/action-links/server/lib/actionLinks.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { Messages, Subscriptions } from '../../../models';
+import { Messages, Subscriptions } from '../../../models/server';
 
 // Action Links namespace creation.
 export const actionLinks = {

diff --git a/app/api/index.js b/app/api/index.js
diff --git a/app/api/server/v1/assets.js b/app/api/server/v1/assets.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import Busboy from 'busboy';
 
-import { RocketChatAssets } from '../../../assets';
+import { RocketChatAssets } from '../../../assets/server';
 import { API } from '../api';
 
 API.v1.addRoute('assets.setAsset', { authRequired: true }, {

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
@@ -539,7 +539,6 @@ API.v1.addRoute('users.setPreferences', { authRequired: true }, {
 				mobileNotifications: Match.Maybe(String),
 				enableAutoAway: Match.Maybe(Boolean),
 				highlights: Match.Maybe(Array),
-				desktopNotificationDuration: Match.Maybe(Number),
 				desktopNotificationRequireInteraction: Match.Maybe(Boolean),
 				messageViewMode: Match.Maybe(Number),
 				hideUsernames: Match.Maybe(Boolean),

diff --git a/app/apps/client/admin/appManage.html b/app/apps/client/admin/appManage.html
@@ -104,6 +104,22 @@ <h2 class="rc-apps-details__name">{{name}}</h2>
 									</div>
 								{{/each}}
 
+								{{#if essentials}}
+									<div class="rc-apps-details__alert rc-apps-details__alert-warning">
+										{{_ "Apps_Essential_Alert"}}
+										<ul>
+											{{#each essentials}}
+												<li>
+													<strong>{{interfaceName}}</strong> -
+													{{_ i18nKey}}
+												</li>
+											{{/each}}
+										</ul>
+										<br/>
+										<p>{{_ "Apps_Essential_Disclaimer"}}</p>
+									</div>
+								{{/if}}
+
 								{{#if categories}}
 									<div class="rc-apps-details__row rc-apps-details__block">
 										<h2> {{_ "Categories"}} </h2>

diff --git a/app/apps/client/admin/appManage.js b/app/apps/client/admin/appManage.js
@@ -317,6 +317,12 @@ Template.appManage.helpers({
 	bundleAppNames(apps) {
 		return apps.map((app) => app.latest.name).join(', ');
 	},
+	essentials() {
+		return Template.instance()._app.get('essentials')?.map((interfaceName) => ({
+			interfaceName,
+			i18nKey: `Apps_Interface_${ interfaceName }`,
+		}));
+	},
 });
 
 Template.appManage.events({

diff --git a/app/apps/server/converters/rooms.js b/app/apps/server/converters/rooms.js
@@ -69,7 +69,7 @@ export class AppRoomsConverter {
 		}
 
 		const newRoom = {
-			_id: room.id,
+			...room.id && { _id: room.id },
 			fname: room.displayName,
 			name: room.slugifiedName,
 			t: room.type,

diff --git a/app/assets/index.js b/app/assets/index.js
diff --git a/app/bigbluebutton/index.js b/app/bigbluebutton/index.js
diff --git a/app/bigbluebutton/server/index.js b/app/bigbluebutton/server/index.js
@@ -0,0 +1 @@
+export { default } from './bigbluebutton-api';
diff --git a/app/blockstack/server/routes.js b/app/blockstack/server/routes.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 
 import { settings } from '../../settings';
-import { RocketChatAssets } from '../../assets';
+import { RocketChatAssets } from '../../assets/server';
 
 WebApp.connectHandlers.use('/_blockstack/manifest', Meteor.bindEnvironment(function(req, res) {
 	const name = settings.get('Site_Name');

diff --git a/app/bot-helpers/index.js b/app/bot-helpers/index.js
diff --git a/app/crowd/server/crowd.js b/app/crowd/server/crowd.js
@@ -9,6 +9,7 @@ import { _setRealName } from '../../lib';
 import { Users } from '../../models';
 import { settings } from '../../settings';
 import { hasRole } from '../../authorization';
+import { deleteUser } from '../../lib/server/functions';
 
 const logger = new Logger('CROWD', {});
 
@@ -203,6 +204,13 @@ export class CROWD {
 				const response = self.crowdClient.searchSync('user', `email=" ${ email } "`);
 				if (!response || response.users.length === 0) {
 					logger.warn('Could not find user in CROWD with username or email:', crowd_username, email);
+					if (settings.get('CROWD_Remove_Orphaned_Users') === true) {
+						logger.info('Removing user:', crowd_username);
+						Meteor.defer(function() {
+							deleteUser(user._id);
+							logger.info('User removed:', crowd_username);
+						});
+					}
 					return;
 				}
 				crowd_username = response.users[0].name;

diff --git a/app/crowd/server/settings.js b/app/crowd/server/settings.js
@@ -14,6 +14,7 @@ Meteor.startup(function() {
 		this.add('CROWD_APP_PASSWORD', '', { type: 'password', enableQuery, i18nLabel: 'Password', secret: true });
 		this.add('CROWD_Sync_User_Data', false, { type: 'boolean', enableQuery, i18nLabel: 'Sync_Users' });
 		this.add('CROWD_Sync_Interval', 'Every 60 mins', { type: 'string', enableQuery: enableSyncQuery, i18nLabel: 'Sync_Interval', i18nDescription: 'Crowd_sync_interval_Description' });
+		this.add('CROWD_Remove_Orphaned_Users', false, { type: 'boolean', public: true, i18nLabel: 'Crowd_Remove_Orphaned_Users' });
 		this.add('CROWD_Clean_Usernames', true, { type: 'boolean', enableQuery, i18nLabel: 'Clean_Usernames', i18nDescription: 'Crowd_clean_usernames_Description' });
 		this.add('CROWD_Allow_Custom_Username', true, { type: 'boolean', i18nLabel: 'CROWD_Allow_Custom_Username' });
 		this.add('CROWD_Test_Connection', 'crowd_test_connection', { type: 'action', actionText: 'Test_Connection', i18nLabel: 'Test_Connection' });

diff --git a/app/integrations/server/api/api.js b/app/integrations/server/api/api.js
@@ -12,7 +12,7 @@ import moment from 'moment';
 
 import { logger } from '../logger';
 import { processWebhookMessage } from '../../../lib';
-import { API, APIClass, defaultRateLimiterOptions } from '../../../api';
+import { API, APIClass, defaultRateLimiterOptions } from '../../../api/server';
 import * as Models from '../../../models';
 import { settings } from '../../../settings/server';
 

diff --git a/app/lib/server/functions/addUserToRoom.js b/app/lib/server/functions/addUserToRoom.js
@@ -21,6 +21,16 @@ export const addUserToRoom = function(rid, user, inviter, silenced) {
 		return;
 	}
 
+	try {
+		Promise.await(Apps.triggerEvent(AppEvents.IPreRoomUserJoined, room, user, inviter));
+	} catch (error) {
+		if (error instanceof AppsEngineException) {
+			throw new Meteor.Error('error-app-prevented', error.message);
+		}
+
+		throw error;
+	}
+
 	if (room.t === 'c' || room.t === 'p') {
 		// Add a new event, with an optional inviter
 		callbacks.run('beforeAddedToRoom', { user, inviter }, room);

diff --git a/app/lib/server/functions/createDirectRoom.js b/app/lib/server/functions/createDirectRoom.js
@@ -7,7 +7,6 @@ import { Rooms, Subscriptions } from '../../../models/server';
 import { settings } from '../../../settings/server';
 import { getDefaultSubscriptionPref } from '../../../utils/server';
 
-
 const generateSubscription = (fname, name, user, extra) => ({
 	alert: false,
 	unread: 0,

diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -112,7 +112,6 @@ export const sendNotification = async ({
 			user: sender,
 			message,
 			room,
-			duration: subscription.desktopNotificationDuration,
 		});
 	}
 
@@ -176,7 +175,6 @@ export const sendNotification = async ({
 const project = {
 	$project: {
 		audioNotifications: 1,
-		desktopNotificationDuration: 1,
 		desktopNotifications: 1,
 		emailNotifications: 1,
 		mobilePushNotifications: 1,
@@ -314,7 +312,7 @@ export async function sendMessageNotifications(message, room, usersInThread = []
 
 export async function sendAllNotifications(message, room) {
 	if (TroubleshootDisableNotifications === true) {
-		return;
+		return message;
 	}
 
 	// threads

diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
@@ -236,11 +236,6 @@ settings.addGroup('Accounts', function() {
 			public: true,
 			i18nLabel: 'Idle_Time_Limit',
 		});
-		this.add('Accounts_Default_User_Preferences_desktopNotificationDuration', 0, {
-			type: 'int',
-			public: true,
-			i18nLabel: 'Notification_Duration',
-		});
 		this.add('Accounts_Default_User_Preferences_desktopNotificationRequireInteraction', false, {
 			type: 'boolean',
 			public: true,

diff --git a/app/livechat/client/index.js b/app/livechat/client/index.js
@@ -9,3 +9,4 @@ import './stylesheets/livechat.css';
 import './views/sideNav/livechat';
 import './views/sideNav/livechatFlex';
 import './externalFrame';
+import './lib/messageTypes';
diff --git a/app/livechat/client/lib/messageTypes.js b/app/livechat/client/lib/messageTypes.js
@@ -0,0 +1,5 @@
+import { actionLinks } from '../../../action-links/client';
+
+actionLinks.register('createLivechatCall', function(message, params, instance) {
+	instance.tabBar.open('video');
+});
diff --git a/app/livechat/client/views/app/livechatAgents.html b/app/livechat/client/views/app/livechatAgents.html
@@ -51,9 +51,11 @@
 					{{#table fixed='true' onScroll=onTableScroll}}
 						<thead>
 							<tr>
-								<th><div class="table-fake-th">{{_ "Name"}}</div></th>
-								<th width="33%"><div class="table-fake-th">{{_ "Username"}}</div></th>
-								<th width="33%"><div class="table-fake-th">{{_ "Email"}}</div></th>
+								<th width="30%"><div class="table-fake-th">{{_ "Name"}}</div></th>
+								<th width="20%"><div class="table-fake-th">{{_ "Username"}}</div></th>
+								<th width="20%"><div class="table-fake-th">{{_ "Email"}}</div></th>
+								<th><div class="table-fake-th">{{_ "Status"}}</div></th>
+								<th><div class="table-fake-th">{{_ "Service"}}</div></th>
 								<th width='40px'><div class="table-fake-th">&nbsp;</div></th>
 							</tr>
 						</thead>
@@ -79,6 +81,8 @@
 									</td>
 									<td>{{username}}</td>
 									<td>{{emailAddress}}</td>
+									<td>{{status}}</td>
+									<td>{{statusService}}</td>
 									<td>
 										<a href="#remove" class="remove-agent">
 											<i class="icon-trash"></i>

diff --git a/app/livechat/client/views/app/livechatAgents.js b/app/livechat/client/views/app/livechatAgents.js
@@ -90,6 +90,10 @@ Template.livechatAgents.helpers({
 			data: Template.instance().tabBarData.get(),
 		};
 	},
+	statusService() {
+		const { status, statusLivechat } = this;
+		return statusLivechat === 'available' && status !== 'offline' ? t('Available') : t('Unavailable');
+	},
 });
 
 const DEBOUNCE_TIME_FOR_SEARCH_AGENTS_IN_MS = 300;