Merge branch 'develop' into feat/videoconf-volume-control

.changeset/chilled-shirts-smile.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Implements removal of OTR (off-the-record) conversation messsages just after OTR session ends.

.changeset/four-pugs-move.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Prevent a bug that caused all sessions being marked as logged out if some required value was missing due to a race condition.

.changeset/many-badgers-jam.md

@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/model-typings": minor
+"@rocket.chat/models": minor
+---
+
+Makes Omnichannel converstion start process transactional.

.changeset/silly-shiny-kiwis.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes `channels.list` endpoint from rejecting pagination parameters

.changeset/three-insects-roll.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a missconception about `/v1/livechat/tags/:tagId` returning 404 if tag is not found

.changeset/violet-bikes-brake.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+---
+
+Fixes issue where a invalid `Accounts_CustomFieldsToShowInUserInfo` value would break the ui

.github/workflows/ci.yml

@@ -899,21 +899,6 @@ jobs:
           # Makes build fail if the release isn't there
           curl --fail https://releases.rocket.chat/$RC_VERSION/info
 
-  trigger-dependent-workflows:
-    runs-on: ubuntu-latest
-    if: github.event_name == 'release'
-    needs:
-      - services-docker-image-publish
-      - docker-image-publish
-    steps:
-      - name: Send context to seperate pipeline
-        uses: peter-evans/repository-dispatch@v2
-        with:
-          token: ${{ secrets.DISTRIBUTION_TOKEN }}
-          event-type: new_release
-          repository: RocketChat/public-releases
-          client-payload: '{"tag": "${{ github.ref_name }}"}'
-
   docs-update:
     name: Update Version Durability
 

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

@@ -28,12 +28,12 @@ import {
 	LivechatRooms,
 	LivechatDepartment,
 	Subscriptions,
-	Rooms,
 	Users,
 	LivechatContacts,
 } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
+import type { ClientSession } from 'mongodb';
 import { ObjectId } from 'mongodb';
 
 import { Livechat as LivechatTyped } from './LivechatTyped';
@@ -67,12 +67,12 @@ export const allowAgentSkipQueue = (agent: SelectedAgent) => {
 
 	return hasRoleAsync(agent.agentId, 'bot');
 };
-export const createLivechatRoom = async (
+export const prepareLivechatRoom = async (
 	rid: string,
 	guest: ILivechatVisitor,
 	roomInfo: IOmnichannelRoomInfo = { source: { type: OmnichannelSourceType.OTHER } },
 	extraData?: IOmnichannelRoomExtraData,
-): Promise<IOmnichannelRoom> => {
+): Promise<InsertionModel<IOmnichannelRoom>> => {
 	check(rid, String);
 	check(
 		guest,
@@ -112,7 +112,7 @@ export const createLivechatRoom = async (
 	const verified = Boolean(contact.channels.some((channel) => isVerifiedChannelInSource(channel, _id, source)));
 
 	// TODO: Solve `u` missing issue
-	const room: InsertionModel<IOmnichannelRoom> = {
+	return {
 		_id: rid,
 		msgs: 0,
 		usersCount: 1,
@@ -145,26 +145,26 @@ export const createLivechatRoom = async (
 		estimatedWaitingTimeQueue: DEFAULT_SLA_CONFIG.ESTIMATED_WAITING_TIME_QUEUE,
 		...extraRoomInfo,
 	} as InsertionModel<IOmnichannelRoom>;
+};
 
-	const result = await Rooms.findOneAndUpdate(
+export const createLivechatRoom = async (room: InsertionModel<IOmnichannelRoom>, session: ClientSession) => {
+	const result = await LivechatRooms.findOneAndUpdate(
 		room,
 		{
 			$set: {},
 		},
 		{
 			upsert: true,
 			returnDocument: 'after',
+			session,
 		},
 	);
 
 	if (!result) {
 		throw new Error('Room not created');
 	}
 
-	await callbacks.run('livechat.newRoom', room);
-	await Message.saveSystemMessageAndNotifyUser('livechat-started', rid, '', { _id, username }, { groupable: false, token: guest.token });
-
-	return result as IOmnichannelRoom;
+	return result;
 };
 
 export const createLivechatInquiry = async ({
@@ -174,13 +174,15 @@ export const createLivechatInquiry = async ({
 	message,
 	initialStatus,
 	extraData,
+	session,
 }: {
 	rid: string;
 	name?: string;
 	guest?: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'department' | 'name' | 'token' | 'activity'>;
 	message?: string;
 	initialStatus?: LivechatInquiryStatus;
 	extraData?: IOmnichannelInquiryExtraData;
+	session?: ClientSession;
 }) => {
 	check(rid, String);
 	check(name, String);
@@ -202,7 +204,7 @@ export const createLivechatInquiry = async ({
 	const ts = new Date();
 
 	logger.debug({
-		msg: `Creating livechat inquiry for visitor ${_id}`,
+		msg: `Creating livechat inquiry for visitor`,
 		visitor: { _id, username, department, status, activity },
 	});
 
@@ -235,6 +237,7 @@ export const createLivechatInquiry = async ({
 		{
 			upsert: true,
 			returnDocument: 'after',
+			session,
 		},
 	);
 	logger.debug(`Inquiry ${result} created for visitor ${_id}`);

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

@@ -1,5 +1,5 @@
 import { Apps, AppEvents } from '@rocket.chat/apps';
-import { Omnichannel } from '@rocket.chat/core-services';
+import { Message, Omnichannel } from '@rocket.chat/core-services';
 import type {
 	ILivechatDepartment,
 	IOmnichannelRoomInfo,
@@ -12,25 +12,23 @@ import type {
 } from '@rocket.chat/core-typings';
 import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
+import type { InsertionModel } from '@rocket.chat/model-typings';
 import { LivechatContacts, LivechatDepartment, LivechatDepartmentAgents, LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue } from './Helper';
+import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue, prepareLivechatRoom } from './Helper';
 import { Livechat } from './LivechatTyped';
 import { RoutingManager } from './RoutingManager';
 import { isVerifiedChannelInSource } from './contacts/isVerifiedChannelInSource';
 import { getOnlineAgents } from './getOnlineAgents';
 import { getInquirySortMechanismSetting } from './settings';
 import { dispatchInquiryPosition } from '../../../../ee/app/livechat-enterprise/server/lib/Helper';
 import { callbacks } from '../../../../lib/callbacks';
+import { client, shouldRetryTransaction } from '../../../../server/database/utils';
 import { sendNotification } from '../../../lib/server';
-import {
-	notifyOnLivechatInquiryChangedById,
-	notifyOnLivechatInquiryChanged,
-	notifyOnSettingChanged,
-} from '../../../lib/server/lib/notifyListener';
+import { notifyOnLivechatInquiryChangedById, notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { i18n } from '../../../utils/lib/i18n';
 import { getOmniChatSortQuery } from '../../lib/inquiries';
@@ -213,6 +211,47 @@ export class QueueManager {
 		return Boolean(contact.channels.some((channel) => isVerifiedChannelInSource(channel, room.v._id, room.source)));
 	}
 
+	static async startConversation(
+		rid: string,
+		insertionRoom: InsertionModel<IOmnichannelRoom>,
+		guest: ILivechatVisitor,
+		roomInfo: IOmnichannelRoomInfo,
+		defaultAgent?: SelectedAgent,
+		message?: string,
+		extraData?: IOmnichannelRoomExtraData,
+		attempts = 3,
+	): Promise<{ room: IOmnichannelRoom; inquiry: ILivechatInquiryRecord }> {
+		const session = client.startSession();
+		try {
+			session.startTransaction();
+			const room = await createLivechatRoom(insertionRoom, session);
+			logger.debug(`Room for visitor ${guest._id} created with id ${room._id}`);
+			const inquiry = await createLivechatInquiry({
+				rid,
+				name: room.fname,
+				initialStatus: await this.getInquiryStatus({ room, agent: defaultAgent }),
+				guest,
+				message,
+				extraData: { ...extraData, source: roomInfo.source },
+				session,
+			});
+			await session.commitTransaction();
+			return { room, inquiry };
+		} catch (e) {
+			await session.abortTransaction();
+			if (shouldRetryTransaction(e)) {
+				if (attempts > 0) {
+					logger.debug({ msg: 'Retrying transaction because of transient error', attemptsLeft: attempts });
+					return this.startConversation(rid, insertionRoom, guest, roomInfo, defaultAgent, message, extraData, attempts - 1);
+				}
+				throw new Error('error-failed-to-start-conversation');
+			}
+			throw e;
+		} finally {
+			await session.endSession();
+		}
+	}
+
 	static async requestRoom({
 		guest,
 		rid = Random.id(),
@@ -280,38 +319,25 @@ export class QueueManager {
 			}
 		}
 
-		const room = await createLivechatRoom(rid, { ...guest, ...(department && { department }) }, roomInfo, {
+		const insertionRoom = await prepareLivechatRoom(rid, { ...guest, ...(department && { department }) }, roomInfo, {
 			...extraData,
 			...(Boolean(customFields) && { customFields }),
 		});
 
-		if (!room) {
-			logger.error(`Room for visitor ${guest._id} not found`);
-			throw new Error('room-not-found');
-		}
-		logger.debug(`Room for visitor ${guest._id} created with id ${room._id}`);
+		// Transactional start of the conversation. This should prevent rooms from being created without inquiries and viceversa.
+		// All the actions that happened inside createLivechatRoom are now outside this transaction
+		const { room, inquiry } = await this.startConversation(rid, insertionRoom, guest, roomInfo, defaultAgent, message, extraData);
 
-		const inquiry = await createLivechatInquiry({
+		await callbacks.run('livechat.newRoom', room);
+		await Message.saveSystemMessageAndNotifyUser(
+			'livechat-started',
 			rid,
-			name: room.fname,
-			initialStatus: await this.getInquiryStatus({ room, agent: defaultAgent }),
-			guest,
-			message,
-			extraData: { ...extraData, source: roomInfo.source },
-		});
-
-		if (!inquiry) {
-			logger.error(`Inquiry for visitor ${guest._id} not found`);
-			throw new Error('inquiry-not-found');
-		}
-
+			'',
+			{ _id: guest._id, username: guest.username },
+			{ groupable: false, token: guest.token },
+		);
 		void Apps.self?.triggerEvent(AppEvents.IPostLivechatRoomStarted, room);
 
-		const livechatSetting = await LivechatRooms.updateRoomCount();
-		if (livechatSetting) {
-			void notifyOnSettingChanged(livechatSetting);
-		}
-
 		await this.processNewInquiry(inquiry, room, defaultAgent);
 		const newRoom = await LivechatRooms.findOneById(rid);
 

apps/meteor/app/mailer/server/api.ts

@@ -5,7 +5,7 @@ import { escapeHTML } from '@rocket.chat/string-helpers';
 import juice from 'juice';
 import { Email } from 'meteor/email';
 import { Meteor } from 'meteor/meteor';
-import stripHtml from 'string-strip-html';
+import { stripHtml } from 'string-strip-html';
 import _ from 'underscore';
 
 import { replaceVariables } from './replaceVariables';

apps/meteor/app/otr/client/OTRRoom.ts

@@ -13,6 +13,7 @@ import { Presence } from '../../../client/lib/presence';
 import { dispatchToastMessage } from '../../../client/lib/toast';
 import { getUidDirectMessage } from '../../../client/lib/utils/getUidDirectMessage';
 import { goToRoomById } from '../../../client/lib/utils/goToRoomById';
+import { Messages } from '../../models/client';
 import { sdk } from '../../utils/client/lib/SDKClient';
 import { t } from '../../utils/lib/i18n';
 import type { IOnUserStreamData, IOTRAlgorithm, IOTRDecrypt, IOTRRoom } from '../lib/IOTR';
@@ -179,11 +180,16 @@ export class OTRRoom implements IOTRRoom {
 		this._sessionKey = null;
 	}
 
+	deleteOTRMessages(): void {
+		Messages.remove({ t: { $in: ['otr', 'otr-ack', ...Object.values(otrSystemMessages)] }, rid: this._roomId });
+	}
+
 	end(): void {
 		this.isFirstOTR = true;
 		this.reset();
 		this.setState(OtrRoomState.NOT_STARTED);
 		Presence.stop(this.peerId, this.onPresenceEventHook);
+		this.deleteOTRMessages();
 		sdk.publish('notify-user', [
 			`${this.peerId}/otr`,
 			'end',
@@ -435,6 +441,7 @@ export class OTRRoom implements IOTRRoom {
 					if (this.getState() === OtrRoomState.ESTABLISHED) {
 						this.reset();
 						this.setState(OtrRoomState.NOT_STARTED);
+						this.deleteOTRMessages();
 						imperativeModal.open({
 							component: GenericModal,
 							props: {

apps/meteor/app/statistics/server/lib/SAUMonitor.ts

@@ -30,6 +30,8 @@ const getUserRoles = mem(
 	{ maxAge: 5000 },
 );
 
+const isProdEnv = process.env.NODE_ENV === 'production';
+
 /**
  * Server Session Monitor for SAU(Simultaneously Active Users) based on Meteor server sessions
  */
@@ -127,9 +129,30 @@ export class SAUMonitorClass {
 			if (!this.isRunning()) {
 				return;
 			}
+
+			if (!userId) {
+				logger.warn(`Received 'accounts.logout' event without 'userId'`);
+				return;
+			}
+
 			const { id: sessionId } = connection;
+			if (!sessionId) {
+				logger.warn(`Received 'accounts.logout' event without 'sessionId'`);
+				return;
+			}
+
+			const session = await Sessions.getLoggedInByUserIdAndSessionId<Pick<ISession, 'loginToken'>>(userId, sessionId, {
+				projection: { loginToken: 1 },
+			});
+			if (!session?.loginToken) {
+				if (!isProdEnv) {
+					throw new Error('Session not found during logout');
+				}
+				logger.error('Session not found during logout', { userId, sessionId });
+				return;
+			}
 
-			await Sessions.logoutBySessionIdAndUserId({ sessionId, userId });
+			await Sessions.logoutBySessionIdAndUserId({ loginToken: session.loginToken, userId });
 		});
 	}