Merge branch 'develop' into fix/failing-to-dismiss-banner

Author: kodiakhq[bot]

.changeset/eighty-wasps-kneel.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed an issue with how the UI checked for permissions when deciding if editing or deleting a message by moderators users

.changeset/short-coins-enjoy.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue where apps installed via the Marketplace would not be shown in the installed list if the app is unpublished

.changeset/tidy-apes-fry.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed inverted navigation direction in the image gallery

.changeset/wild-carrots-know.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Remove password change reason when the `request password change` option is set to false

apps/meteor/app/authorization/server/functions/canDeleteMessage.ts

@@ -34,7 +34,7 @@ export const canDeleteMessageAsync = async (
 	if (!allowed) {
 		return false;
 	}
-	const bypassBlockTimeLimit = await hasPermissionAsync(uid, 'bypass-time-limit-edit-and-delete');
+	const bypassBlockTimeLimit = await hasPermissionAsync(uid, 'bypass-time-limit-edit-and-delete', rid);
 
 	if (!bypassBlockTimeLimit) {
 		const blockDeleteInMinutes = await getValue('Message_AllowDeleting_BlockDeleteInMinutes');

apps/meteor/app/lib/server/functions/deleteUser.ts

@@ -19,7 +19,7 @@ import { callbacks } from '../../../../lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
 import { FileUpload } from '../../../file-upload/server';
 import { settings } from '../../../settings/server';
-import { notifyOnRoomChangedById, notifyOnIntegrationChangedByUserId } from '../lib/notifyListener';
+import { notifyOnRoomChangedById, notifyOnIntegrationChangedByUserId, notifyOnLivechatDepartmentAgentChanged } from '../lib/notifyListener';
 import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from './getRoomsWithSingleOwner';
 import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
 import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
@@ -95,9 +95,24 @@ export async function deleteUser(userId: string, confirmRelinquish = false, dele
 
 		await Subscriptions.removeByUserId(userId); // Remove user subscriptions
 
+		// Remove user as livechat agent
 		if (user.roles.includes('livechat-agent')) {
-			// Remove user as livechat agent
-			await LivechatDepartmentAgents.removeByAgentId(userId);
+			const departmentAgents = await LivechatDepartmentAgents.findByAgentId(userId).toArray();
+
+			const { deletedCount } = await LivechatDepartmentAgents.removeByAgentId(userId);
+
+			if (deletedCount > 0) {
+				departmentAgents.forEach((depAgent) => {
+					void notifyOnLivechatDepartmentAgentChanged(
+						{
+							_id: depAgent._id,
+							agentId: userId,
+							departmentId: depAgent.departmentId,
+						},
+						'removed',
+					);
+				});
+			}
 		}
 
 		if (user.roles.includes('livechat-monitor')) {

apps/meteor/app/lib/server/functions/saveUser.js

@@ -401,6 +401,7 @@ export const saveUser = async function (userId, userData) {
 
 	const updateUser = {
 		$set: {},
+		$unset: {},
 	};
 
 	handleBio(updateUser, userData.bio);
@@ -419,6 +420,9 @@ export const saveUser = async function (userId, userData) {
 
 	if (typeof userData.requirePasswordChange !== 'undefined') {
 		updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
+		if (!userData.requirePasswordChange) {
+			updateUser.$unset.requirePasswordChangeReason = 1;
+		}
 	}
 
 	if (typeof userData.verified === 'boolean') {

apps/meteor/app/lib/server/lib/notifyListener.ts

@@ -10,6 +10,7 @@ import type {
 	IPbxEvent,
 	LoginServiceConfiguration as LoginServiceConfigurationData,
 	ILivechatPriority,
+	ILivechatDepartmentAgents,
 	IEmailInbox,
 	IIntegrationHistory,
 	AtLeast,
@@ -23,6 +24,7 @@ import {
 	Integrations,
 	LoginServiceConfiguration,
 	IntegrationHistory,
+	LivechatDepartmentAgents,
 } from '@rocket.chat/models';
 
 type ClientAction = 'inserted' | 'updated' | 'removed';
@@ -307,3 +309,47 @@ export async function notifyOnIntegrationHistoryChangedById<T extends IIntegrati
 
 	void api.broadcast('watch.integrationHistory', { clientAction, id: item._id, data: item, diff });
 }
+
+export async function notifyOnLivechatDepartmentAgentChanged<T extends ILivechatDepartmentAgents>(
+	data: Partial<T> & Pick<T, '_id' | 'agentId' | 'departmentId'>,
+	clientAction: ClientAction = 'updated',
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	void api.broadcast('watch.livechatDepartmentAgents', { clientAction, id: data._id, data });
+}
+
+export async function notifyOnLivechatDepartmentAgentChangedByDepartmentId<T extends ILivechatDepartmentAgents>(
+	departmentId: T['departmentId'],
+	clientAction: 'inserted' | 'updated' = 'updated',
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const items = LivechatDepartmentAgents.findByDepartmentId(departmentId, { projection: { _id: 1, agentId: 1, departmentId: 1 } });
+
+	for await (const item of items) {
+		void api.broadcast('watch.livechatDepartmentAgents', { clientAction, id: item._id, data: item });
+	}
+}
+
+export async function notifyOnLivechatDepartmentAgentChangedByAgentsAndDepartmentId<T extends ILivechatDepartmentAgents>(
+	agentsIds: T['agentId'][],
+	departmentId: T['departmentId'],
+	clientAction: 'inserted' | 'updated' = 'updated',
+): Promise<void> {
+	if (!dbWatchersDisabled) {
+		return;
+	}
+
+	const items = LivechatDepartmentAgents.findByAgentsAndDepartmentId(agentsIds, departmentId, {
+		projection: { _id: 1, agentId: 1, departmentId: 1 },
+	});
+
+	for await (const item of items) {
+		void api.broadcast('watch.livechatDepartmentAgents', { clientAction, id: item._id, data: item });
+	}
+}

apps/meteor/app/lib/server/methods/updateMessage.ts

@@ -53,7 +53,7 @@ export async function executeUpdateMessage(uid: IUser['_id'], message: AtLeast<I
 	}
 
 	const blockEditInMinutes = settings.get('Message_AllowEditing_BlockEditInMinutes');
-	const bypassBlockTimeLimit = await hasPermissionAsync(uid, 'bypass-time-limit-edit-and-delete');
+	const bypassBlockTimeLimit = await hasPermissionAsync(uid, 'bypass-time-limit-edit-and-delete', message.rid);
 
 	if (!bypassBlockTimeLimit && Match.test(blockEditInMinutes, Number) && blockEditInMinutes !== 0) {
 		let currentTsDiff = 0;

apps/meteor/app/livechat/server/hooks/afterAgentRemoved.ts

@@ -1,13 +1,28 @@
 import { LivechatDepartment, Users, LivechatDepartmentAgents, LivechatVisitors } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnLivechatDepartmentAgentChanged } from '../../../lib/server/lib/notifyListener';
 
 callbacks.add('livechat.afterAgentRemoved', async ({ agent }) => {
-	const departmentIds = (await LivechatDepartmentAgents.findByAgentId(agent._id).toArray()).map((department) => department.departmentId);
-	await Promise.all([
+	const departments = await LivechatDepartmentAgents.findByAgentId(agent._id).toArray();
+
+	const [, { deletedCount }] = await Promise.all([
 		Users.removeAgent(agent._id),
 		LivechatDepartmentAgents.removeByAgentId(agent._id),
 		agent.username && LivechatVisitors.removeContactManagerByUsername(agent.username),
-		departmentIds.length && LivechatDepartment.decreaseNumberOfAgentsByIds(departmentIds),
+		departments.length && LivechatDepartment.decreaseNumberOfAgentsByIds(departments.map(({ departmentId }) => departmentId)),
 	]);
+
+	if (deletedCount > 0) {
+		departments.forEach((depAgent) => {
+			void notifyOnLivechatDepartmentAgentChanged(
+				{
+					_id: depAgent._id,
+					agentId: agent._id,
+					departmentId: depAgent.departmentId,
+				},
+				'removed',
+			);
+		});
+	}
 });

apps/meteor/app/livechat/server/lib/Departments.ts

@@ -1,8 +1,9 @@
-import type { ILivechatDepartment, ILivechatDepartmentAgents } from '@rocket.chat/core-typings';
+import type { ILivechatDepartment } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 import { LivechatDepartment, LivechatDepartmentAgents, LivechatRooms } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnLivechatDepartmentAgentChanged } from '../../../lib/server/lib/notifyListener';
 
 class DepartmentHelperClass {
 	logger = new Logger('Omnichannel:DepartmentHelper');
@@ -24,29 +25,42 @@ class DepartmentHelperClass {
 			throw new Error('error-failed-to-delete-department');
 		}
 
-		const agentsIds: string[] = await LivechatDepartmentAgents.findAgentsByDepartmentId<Pick<ILivechatDepartmentAgents, 'agentId'>>(
-			department._id,
-			{ projection: { agentId: 1 } },
-		)
-			.cursor.map((agent) => agent.agentId)
-			.toArray();
+		const removedAgents = await LivechatDepartmentAgents.findByDepartmentId(department._id, { projection: { agentId: 1 } }).toArray();
 
 		this.logger.debug(
 			`Performing post-department-removal actions: ${_id}. Removing department agents, unsetting fallback department and removing department from rooms`,
 		);
 
+		const removeByDept = LivechatDepartmentAgents.removeByDepartmentId(_id);
+
 		const promiseResponses = await Promise.allSettled([
-			LivechatDepartmentAgents.removeByDepartmentId(_id),
+			removeByDept,
 			LivechatDepartment.unsetFallbackDepartmentByDepartmentId(_id),
 			LivechatRooms.bulkRemoveDepartmentAndUnitsFromRooms(_id),
 		]);
+
 		promiseResponses.forEach((response, index) => {
 			if (response.status === 'rejected') {
 				this.logger.error(`Error while performing post-department-removal actions: ${_id}. Action No: ${index}. Error:`, response.reason);
 			}
 		});
 
-		await callbacks.run('livechat.afterRemoveDepartment', { department, agentsIds });
+		const { deletedCount } = await removeByDept;
+
+		if (deletedCount > 0) {
+			removedAgents.forEach(({ _id: docId, agentId }) => {
+				void notifyOnLivechatDepartmentAgentChanged(
+					{
+						_id: docId,
+						agentId,
+						departmentId: _id,
+					},
+					'removed',
+				);
+			});
+		}
+
+		await callbacks.run('livechat.afterRemoveDepartment', { department, agentsIds: removedAgents.map(({ agentId }) => agentId) });
 
 		return ret;
 	}

apps/meteor/app/livechat/server/lib/Helper.ts

@@ -37,6 +37,10 @@ import { i18n } from '../../../../server/lib/i18n';
 import { hasRoleAsync } from '../../../authorization/server/functions/hasRole';
 import { sendNotification } from '../../../lib/server';
 import { sendMessage } from '../../../lib/server/functions/sendMessage';
+import {
+	notifyOnLivechatDepartmentAgentChanged,
+	notifyOnLivechatDepartmentAgentChangedByAgentsAndDepartmentId,
+} from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { Livechat as LivechatTyped } from './LivechatTyped';
 import { queueInquiry, saveQueueInquiry } from './QueueManager';
@@ -697,14 +701,31 @@ export const updateDepartmentAgents = async (
 	});
 
 	const { upsert = [], remove = [] } = agents;
-	const agentsRemoved = [];
+
+	const agentsUpdated = [];
+	const agentsRemoved = remove.map(({ agentId }: { agentId: string }) => agentId);
 	const agentsAdded = [];
-	for await (const { agentId } of remove) {
-		await LivechatDepartmentAgents.removeByDepartmentIdAndAgentId(departmentId, agentId);
-		agentsRemoved.push(agentId);
-	}
 
 	if (agentsRemoved.length > 0) {
+		const removedIds = await LivechatDepartmentAgents.findByAgentsAndDepartmentId(agentsRemoved, departmentId, {
+			projection: { agentId: 1 },
+		}).toArray();
+
+		const { deletedCount } = await LivechatDepartmentAgents.removeByIds(removedIds.map(({ _id }) => _id));
+
+		if (deletedCount > 0) {
+			removedIds.forEach(({ _id, agentId }) => {
+				void notifyOnLivechatDepartmentAgentChanged(
+					{
+						_id,
+						agentId,
+						departmentId,
+					},
+					'removed',
+				);
+			});
+		}
+
 		callbacks.runAsync('livechat.removeAgentDepartment', { departmentId, agentsId: agentsRemoved });
 	}
 
@@ -714,14 +735,28 @@ export const updateDepartmentAgents = async (
 			continue;
 		}
 
-		await LivechatDepartmentAgents.saveAgent({
+		const livechatDepartmentAgent = await LivechatDepartmentAgents.saveAgent({
 			agentId: agent.agentId,
 			departmentId,
 			username: agentFromDb.username || '',
 			count: agent.count ? parseFromIntOrStr(agent.count) : 0,
 			order: agent.order ? parseFromIntOrStr(agent.order) : 0,
 			departmentEnabled,
 		});
+
+		if (livechatDepartmentAgent.upsertedId) {
+			void notifyOnLivechatDepartmentAgentChanged(
+				{
+					_id: livechatDepartmentAgent.upsertedId as any,
+					agentId: agent.agentId,
+					departmentId,
+				},
+				'inserted',
+			);
+		} else {
+			agentsUpdated.push(agent.agentId);
+		}
+
 		agentsAdded.push(agent.agentId);
 	}
 
@@ -732,6 +767,10 @@ export const updateDepartmentAgents = async (
 		});
 	}
 
+	if (agentsUpdated.length > 0) {
+		void notifyOnLivechatDepartmentAgentChangedByAgentsAndDepartmentId(agentsUpdated, departmentId);
+	}
+
 	if (agentsRemoved.length > 0 || agentsAdded.length > 0) {
 		const numAgents = await LivechatDepartmentAgents.countByDepartmentId(departmentId);
 		await LivechatDepartment.updateNumAgentsById(departmentId, numAgents);

apps/meteor/app/livechat/server/lib/LivechatTyped.ts

@@ -57,7 +57,7 @@ import { FileUpload } from '../../../file-upload/server';
 import { deleteMessage } from '../../../lib/server/functions/deleteMessage';
 import { sendMessage } from '../../../lib/server/functions/sendMessage';
 import { updateMessage } from '../../../lib/server/functions/updateMessage';
-import { notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
+import { notifyOnLivechatDepartmentAgentChangedByDepartmentId, notifyOnRoomChangedById } from '../../../lib/server/lib/notifyListener';
 import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
@@ -1002,6 +1002,8 @@ class LivechatClass {
 
 		await Promise.all([LivechatDepartmentAgents.disableAgentsByDepartmentId(_id), LivechatDepartment.archiveDepartment(_id)]);
 
+		void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id);
+
 		await callbacks.run('livechat.afterDepartmentArchived', department);
 	}
 
@@ -1014,6 +1016,9 @@ class LivechatClass {
 
 		// TODO: these kind of actions should be on events instead of here
 		await Promise.all([LivechatDepartmentAgents.enableAgentsByDepartmentId(_id), LivechatDepartment.unarchiveDepartment(_id)]);
+
+		void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id);
+
 		return true;
 	}
 

apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts

@@ -185,7 +185,7 @@ Meteor.startup(async () => {
 				return false;
 			}
 			const blockEditInMinutes = settings.Message_AllowEditing_BlockEditInMinutes as number;
-			const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete');
+			const bypassBlockTimeLimit = hasPermission('bypass-time-limit-edit-and-delete', message.rid);
 
 			if (!bypassBlockTimeLimit && blockEditInMinutes) {
 				let msgTs;

apps/meteor/app/utils/rocketchat.info

@@ -1,3 +1,3 @@
 {
-	"version": "6.9.0"
+	"version": "6.10.0-develop"
 }