Merge branch 'develop' into nonstop-sound

Author: kodiakhq[bot]

.changeset/forty-ghosts-flow.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed "Take it" button behavior disabling it when agent status is set to offline

.changeset/late-drinks-brake.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Fixed an issue that would not allow the user to dismiss the closeToSeatsLimit banner for old workspaces
+

.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/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/otr/client/OTR.ts

@@ -24,6 +24,16 @@ class OTR implements IOTR {
 		this.instancesByRoomId[rid] = otrRoom;
 		return this.instancesByRoomId[rid];
 	}
+
+	closeAllInstances(): void {
+		// Resets state, but doesnt emit events
+		// Other party should receive event and fire events
+		Object.values(this.instancesByRoomId).forEach((instance) => {
+			instance.softReset();
+		});
+
+		this.instancesByRoomId = {};
+	}
 }
 
 export default new OTR();

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

@@ -1,4 +1,5 @@
 import type { IRoom, IMessage, IUser } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
 import { Random } from '@rocket.chat/random';
 import EJSON from 'ejson';
 import { Meteor } from 'meteor/meteor';
@@ -7,6 +8,7 @@ import { Tracker } from 'meteor/tracker';
 
 import GenericModal from '../../../client/components/GenericModal';
 import { imperativeModal } from '../../../client/lib/imperativeModal';
+import type { UserPresence } from '../../../client/lib/presence';
 import { Presence } from '../../../client/lib/presence';
 import { dispatchToastMessage } from '../../../client/lib/toast';
 import { getUidDirectMessage } from '../../../client/lib/utils/getUidDirectMessage';
@@ -47,13 +49,16 @@ export class OTRRoom implements IOTRRoom {
 
 	private isFirstOTR: boolean;
 
+	private onPresenceEventHook: (event: UserPresence | undefined) => void;
+
 	protected constructor(uid: IUser['_id'], rid: IRoom['_id'], peerId: IUser['_id']) {
 		this._userId = uid;
 		this._roomId = rid;
 		this._keyPair = null;
 		this._sessionKey = null;
 		this.peerId = peerId;
 		this.isFirstOTR = true;
+		this.onPresenceEventHook = this.onPresenceEvent.bind(this);
 	}
 
 	public static create(uid: IUser['_id'], rid: IRoom['_id']): OTRRoom | undefined {
@@ -110,6 +115,35 @@ export class OTRRoom implements IOTRRoom {
 		}
 	}
 
+	onPresenceEvent(event: UserPresence | undefined): void {
+		if (!event) {
+			return;
+		}
+		if (event.status !== UserStatus.OFFLINE) {
+			return;
+		}
+		console.warn(`OTR Room ${this._roomId} ended because ${this.peerId} went offline`);
+		this.end();
+
+		imperativeModal.open({
+			component: GenericModal,
+			props: {
+				variant: 'warning',
+				title: t('OTR'),
+				children: t('OTR_Session_ended_other_user_went_offline', { username: event.username }),
+				confirmText: t('Ok'),
+				onClose: imperativeModal.close,
+				onConfirm: imperativeModal.close,
+			},
+		});
+	}
+
+	// Starts listening to other user's status changes and end OTR if any of the Users goes offline
+	// this should be called in 2 places: on acknowledge (meaning user accepted OTR) or on establish (meaning user initiated OTR)
+	listenToUserStatus(): void {
+		Presence.listen(this.peerId, this.onPresenceEventHook);
+	}
+
 	acknowledge(): void {
 		void sdk.rest.post('/v1/statistics.telemetry', { params: [{ eventName: 'otrStats', timestamp: Date.now(), rid: this._roomId }] });
 
@@ -137,10 +171,19 @@ export class OTRRoom implements IOTRRoom {
 		]);
 	}
 
+	softReset(): void {
+		this.isFirstOTR = true;
+		this.setState(OtrRoomState.NOT_STARTED);
+		this._keyPair = null;
+		this._exportedPublicKey = {};
+		this._sessionKey = null;
+	}
+
 	end(): void {
 		this.isFirstOTR = true;
 		this.reset();
 		this.setState(OtrRoomState.NOT_STARTED);
+		Presence.stop(this.peerId, this.onPresenceEventHook);
 		sdk.publish('notify-user', [
 			`${this.peerId}/otr`,
 			'end',
@@ -285,6 +328,7 @@ export class OTRRoom implements IOTRRoom {
 						setTimeout(async () => {
 							this.setState(OtrRoomState.ESTABLISHED);
 							this.acknowledge();
+							this.listenToUserStatus();
 
 							if (data.refresh) {
 								await sdk.rest.post('/v1/chat.otr', {
@@ -362,6 +406,7 @@ export class OTRRoom implements IOTRRoom {
 					this.setState(OtrRoomState.ESTABLISHED);
 
 					if (this.isFirstOTR) {
+						this.listenToUserStatus();
 						await sdk.rest.post('/v1/chat.otr', {
 							roomId: this._roomId,
 							type: otrSystemMessages.USER_JOINED_OTR,

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

@@ -0,0 +1,7 @@
+import { Accounts } from 'meteor/accounts-base';
+
+import OTR from './OTR';
+
+Accounts.onLogout(() => {
+	OTR.closeAllInstances();
+});

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

@@ -1,3 +1,4 @@
 import './OTRRoom';
 import './OTR';
 import './messageTypes';
+import './events';

apps/meteor/client/components/ImageGallery/ImageGallery.tsx

@@ -176,19 +176,19 @@ export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[];
 						modules={[Navigation, Zoom, Keyboard, A11y]}
 						onInit={(swiper) => setSwiperInst(swiper)}
 						onSlidesGridLengthChange={(swiper) => {
-							swiper.slideTo(images.length - gridSize, 2000);
+							swiper.slideTo(images.length - gridSize, 0);
 							setGridSize(images.length);
 						}}
 						onReachBeginning={loadMore}
 						initialSlide={images.length - 1}
 					>
-						{images.toReversed().map(({ _id, url }) => (
+						{[...images].reverse().map(({ _id, url }) => (
 							<SwiperSlide key={_id}>
 								<div className='swiper-zoom-container'>
 									{/* eslint-disable-next-line
 										jsx-a11y/no-noninteractive-element-interactions,
-									 	jsx-a11y/click-events-have-key-events
-									 */}
+										jsx-a11y/click-events-have-key-events
+									*/}
 									<img src={url} loading='lazy' alt='' data-qa-zoom-scale={zoomScale} onClick={preventPropagation} />
 									<div className='rcx-lazy-preloader'>
 										<Throbber inheritColor />

apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelInquiry.tsx

@@ -1,14 +1,17 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
-import { useEndpoint, useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useMethod, useToastMessageDispatch, useTranslation, useUser } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
-import React from 'react';
+import React, { useMemo } from 'react';
 
+import { useOmnichannelAgentAvailable } from '../../../../hooks/omnichannel/useOmnichannelAgentAvailable';
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 
 export const ComposerOmnichannelInquiry = (): ReactElement => {
+	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
-
+	const user = useUser();
+	const agentAvailable = useOmnichannelAgentAvailable();
 	const room = useOmnichannelRoom();
 	const getInquire = useEndpoint('GET', `/v1/livechat/inquiries.getOne`);
 	const result = useQuery(['inquire', room._id], () =>
@@ -33,11 +36,24 @@ export const ComposerOmnichannelInquiry = (): ReactElement => {
 		}
 	};
 
-	const t = useTranslation();
+	const title = useMemo(() => {
+		if (user?.status === 'offline') {
+			return t('You_cant_take_chats_offline');
+		}
+
+		if (!agentAvailable) {
+			return t('You_cant_take_chats_unavailable');
+		}
+	}, [agentAvailable, t, user?.status]);
+
 	return (
 		<MessageFooterCallout aria-busy={result.isLoading}>
 			<MessageFooterCalloutContent>{t('you_are_in_preview_mode_of_incoming_livechat')}</MessageFooterCalloutContent>
-			<MessageFooterCalloutAction disabled={result.isLoading} onClick={handleTakeInquiry}>
+			<MessageFooterCalloutAction
+				{...(title && { title })}
+				disabled={result.isLoading || user?.status === 'offline' || !agentAvailable}
+				onClick={handleTakeInquiry}
+			>
 				{t('Take_it')}
 			</MessageFooterCalloutAction>
 		</MessageFooterCallout>

apps/meteor/server/services/banner/service.ts

@@ -68,6 +68,12 @@ export class BannerService extends ServiceClassInternal implements IBannerServic
 			.filter((banner) => !dismissed.has(banner._id))
 			.map((banner) => ({
 				...banner,
+				view: {
+					...banner.view,
+					// All modern banners should have a viewId, but we have old banners that were created without it
+					// such as the seatsTaken banner. In this case, we use the bannerId as the viewId
+					viewId: banner.view.viewId || banner._id,
+				},
 				// add surface to legacy banners
 				surface: !banner.surface ? 'banner' : banner.surface,
 			}));

apps/meteor/tests/data/users.helper.js

@@ -1,6 +1,8 @@
 import { UserStatus } from '@rocket.chat/core-typings';
 import { api, credentials, request } from './api-data';
 import { password } from './user';
+import { MongoClient } from 'mongodb';
+import { URL_MONGODB } from '../e2e/config/constants';
 
 export const createUser = (userData = {}) =>
 	new Promise((resolve) => {
@@ -105,3 +107,15 @@ export const registerUser = async (userData = {}, overrideCredentials = credenti
 
 	return result.body.user;
 };
+
+// For changing user data when it's not possible to do so via API
+export const updateUserInDb = async (userId, userData) => {
+	const connection = await MongoClient.connect(URL_MONGODB);
+
+	await connection
+		.db()
+		.collection('users')
+		.updateOne({ _id: userId }, { $set: { ...userData } });
+
+	await connection.close();
+};

apps/meteor/tests/e2e/.eslintrc.json

@@ -1,6 +1,6 @@
 {
 	"root": true,
-	"extends": ["@rocket.chat/eslint-config/original", "@rocket.chat/eslint-config/react", "prettier", "plugin:@typescript-eslint/recommended"],
+	"extends": ["@rocket.chat/eslint-config", "@rocket.chat/eslint-config/react", "prettier", "plugin:@typescript-eslint/recommended"],
 	"parser": "@typescript-eslint/parser",
 	"plugins": ["prettier", "testing-library", "anti-trojan-source", "no-floating-promise"],
 	"rules": {

apps/meteor/tests/e2e/access-security-page.spec.ts

@@ -27,7 +27,7 @@ test.describe.serial('access-security-page', () => {
 			setSettingValueById(api, 'Accounts_AllowPasswordChange', true),
 			setSettingValueById(api, 'Accounts_TwoFactorAuthentication_Enabled', true),
 			setSettingValueById(api, 'E2E_Enable', false),
-		])
+		]),
 	);
 
 	test('security tab is invisible when password change, 2FA and E2E are disabled', async ({ page }) => {
@@ -77,5 +77,5 @@ test.describe.serial('access-security-page', () => {
 			]);
 			await expect(poAccountProfile.securityE2EEncryptionSection).toBeVisible();
 		});
-	})
+	});
 });