Merge branch 'develop' into feat/user-channel-uikit

.changeset/cold-beds-hope.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue not allowing override retention policy in channels

.changeset/cuddly-owls-join.md

@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue that prevented CAS users from being merged with existing user data on login

.changeset/ninety-rivers-mix.md

@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/rest-typings": minor
+---
+
+Fixed issue with "Export room as file" feature (`rooms.export` endpoint) generating an empty export when given an invalid date

.changeset/real-bobcats-train.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': patch
+'@rocket.chat/meteor': patch
+---
+
+Don't show Join default channels option on edit user form.

.changeset/smooth-knives-turn.md

@@ -0,0 +1,7 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Executing a logout and login action in the same "tab/instance", some streams were not being recreated, causing countless types of bugs.
+
+PS: as a workaround reloading after logout or login  in also solves the problem.

.changeset/weak-turkeys-sit.md

@@ -0,0 +1,8 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed a bad behavior with the interaction between OTR system messages & trash collection. We use trash collection as a temporary storage that holds recently deleted items from some collections. Messages is one of those. This was causing "User joined OTR" messages to be viewable when querying the trash collection.
+Since OTR messages are by definition private, code was updated to bypass trash collection when removing these special messages.
+
+Note: this only applies to these system messages. OTR user's messages are not stored on the database.

.changeset/wise-pianos-explode.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed issue with external users being able to reset their passwords even when the "Allow Password Change for OAuth Users" setting is disabled

.github/CODEOWNERS

@@ -28,6 +28,6 @@ apps/meteor/server/startup/migrations @RocketChat/Architecture
 /apps/meteor/ee/app/canned-responses @RocketChat/omnichannel
 /apps/meteor/ee/app/livechat @RocketChat/omnichannel
 /apps/meteor/ee/app/livechat-enterprise @RocketChat/omnichannel
-/apps/meteor/ee/client/omnichannel @RocketChat/omnichannel
+/apps/meteor/client/omnichannel @RocketChat/omnichannel
 /apps/meteor/client/components/omnichannel @RocketChat/omnichannel
 /apps/meteor/client/components/voip @RocketChat/omnichannel

.github/workflows/pr-title-checker.yml

@@ -12,6 +12,6 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: thehanimo/pr-title-checker@v1.3.7
+      - uses: thehanimo/pr-title-checker@v1.4.1
         with:
           GITHUB_TOKEN: ${{ secrets.RC_TITLE_CHECKER }}

apps/meteor/.storybook/main.js

@@ -7,7 +7,6 @@ module.exports = {
 		'../client/**/*.stories.{js,tsx}',
 		'../app/**/*.stories.{js,tsx}',
 		'../ee/app/**/*.stories.{js,tsx}',
-		'../ee/client/**/*.stories.{js,tsx}',
 	],
 	addons: [
 		'@storybook/addon-essentials',

apps/meteor/app/api/server/v1/rooms.ts

@@ -2,7 +2,7 @@ import { Media } from '@rocket.chat/core-services';
 import type { IRoom, IUpload } from '@rocket.chat/core-typings';
 import { Messages, Rooms, Users, Uploads } from '@rocket.chat/models';
 import type { Notifications } from '@rocket.chat/rest-typings';
-import { isGETRoomsNameExists, isRoomsImagesProps, isRoomsMuteUnmuteUserProps } from '@rocket.chat/rest-typings';
+import { isGETRoomsNameExists, isRoomsImagesProps, isRoomsMuteUnmuteUserProps, isRoomsExportProps } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { isTruthy } from '../../../../lib/isTruthy';
@@ -599,15 +599,11 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'rooms.export',
-	{ authRequired: true },
+	{ authRequired: true, validateParams: isRoomsExportProps },
 	{
 		async post() {
 			const { rid, type } = this.bodyParams;
 
-			if (!rid || !type || !['email', 'file'].includes(type)) {
-				throw new Meteor.Error('error-invalid-params');
-			}
-
 			if (!(await hasPermissionAsync(this.userId, 'mail-messages', rid))) {
 				throw new Meteor.Error('error-action-not-allowed', 'Mailing is not allowed');
 			}
@@ -627,12 +623,8 @@ API.v1.addRoute(
 				const { dateFrom, dateTo } = this.bodyParams;
 				const { format } = this.bodyParams;
 
-				if (!['html', 'json'].includes(format || '')) {
-					throw new Meteor.Error('error-invalid-format');
-				}
-
-				const convertedDateFrom = new Date(dateFrom || '');
-				const convertedDateTo = new Date(dateTo || '');
+				const convertedDateFrom = dateFrom ? new Date(dateFrom) : new Date(0);
+				const convertedDateTo = dateTo ? new Date(dateTo) : new Date();
 				convertedDateTo.setDate(convertedDateTo.getDate() + 1);
 
 				if (convertedDateFrom > convertedDateTo) {
@@ -658,10 +650,6 @@ API.v1.addRoute(
 					throw new Meteor.Error('error-invalid-recipient');
 				}
 
-				if (messages?.length === 0) {
-					throw new Meteor.Error('error-invalid-messages');
-				}
-
 				const result = await dataExport.sendViaEmail(
 					{
 						rid,

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

@@ -1,4 +1,5 @@
 import { hasAllPermission, hasAtLeastOnePermission, hasPermission, userHasAllPermission } from './hasPermission';
 import { hasRole, hasAnyRole } from './hasRole';
+import './restrictedRoles';
 
 export { hasAllPermission, hasAtLeastOnePermission, hasRole, hasAnyRole, hasPermission, userHasAllPermission };

apps/meteor/app/authorization/client/restrictedRoles.ts

@@ -0,0 +1,12 @@
+import { Meteor } from 'meteor/meteor';
+
+import { sdk } from '../../utils/client/lib/SDKClient';
+import { AuthorizationUtils } from '../lib';
+
+Meteor.startup(async () => {
+	const result = await sdk.call('license:isEnterprise');
+	if (result) {
+		// #ToDo: Load this from the server with an API call instead of having a duplicate list
+		AuthorizationUtils.addRolePermissionWhiteList('guest', ['view-d-room', 'view-joined-room', 'view-p-room', 'start-discussion']);
+	}
+});

apps/meteor/ee/app/canned-responses/client/startup/responses.js → apps/meteor/app/canned-responses/client/startup/responses.js

@@ -1,9 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { hasPermission } from '../../../../../app/authorization/client';
-import { settings } from '../../../../../app/settings/client';
-import { sdk } from '../../../../../app/utils/client/lib/SDKClient';
+import { hasPermission } from '../../../authorization/client';
+import { settings } from '../../../settings/client';
+import { sdk } from '../../../utils/client/lib/SDKClient';
 import { CannedResponse } from '../collections/CannedResponse';
 
 const events = {

apps/meteor/app/channel-settings/server/methods/saveRoomSettings.ts

@@ -117,74 +117,54 @@ const validators: RoomSettingsValidators = {
 		}
 	},
 	async retentionEnabled({ userId, value, room, rid }) {
-		if (!hasRetentionPolicy(room)) {
-			throw new Meteor.Error('error-action-not-allowed', 'Room does not have retention policy', {
-				method: 'saveRoomSettings',
-				action: 'Editing_room',
-			});
-		}
-
-		if (!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) && value !== room.retention.enabled) {
+		if (
+			!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) &&
+			(!hasRetentionPolicy(room) || value !== room.retention.enabled)
+		) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing room retention policy is not allowed', {
 				method: 'saveRoomSettings',
 				action: 'Editing_room',
 			});
 		}
 	},
 	async retentionMaxAge({ userId, value, room, rid }) {
-		if (!hasRetentionPolicy(room)) {
-			throw new Meteor.Error('error-action-not-allowed', 'Room does not have retention policy', {
-				method: 'saveRoomSettings',
-				action: 'Editing_room',
-			});
-		}
-
-		if (!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) && value !== room.retention.maxAge) {
+		if (
+			!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) &&
+			(!hasRetentionPolicy(room) || value !== room.retention.maxAge)
+		) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing room retention policy is not allowed', {
 				method: 'saveRoomSettings',
 				action: 'Editing_room',
 			});
 		}
 	},
 	async retentionExcludePinned({ userId, value, room, rid }) {
-		if (!hasRetentionPolicy(room)) {
-			throw new Meteor.Error('error-action-not-allowed', 'Room does not have retention policy', {
-				method: 'saveRoomSettings',
-				action: 'Editing_room',
-			});
-		}
-
-		if (!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) && value !== room.retention.excludePinned) {
+		if (
+			!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) &&
+			(!hasRetentionPolicy(room) || value !== room.retention.excludePinned)
+		) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing room retention policy is not allowed', {
 				method: 'saveRoomSettings',
 				action: 'Editing_room',
 			});
 		}
 	},
 	async retentionFilesOnly({ userId, value, room, rid }) {
-		if (!hasRetentionPolicy(room)) {
-			throw new Meteor.Error('error-action-not-allowed', 'Room does not have retention policy', {
-				method: 'saveRoomSettings',
-				action: 'Editing_room',
-			});
-		}
-
-		if (!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) && value !== room.retention.filesOnly) {
+		if (
+			!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) &&
+			(!hasRetentionPolicy(room) || value !== room.retention.filesOnly)
+		) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing room retention policy is not allowed', {
 				method: 'saveRoomSettings',
 				action: 'Editing_room',
 			});
 		}
 	},
 	async retentionIgnoreThreads({ userId, value, room, rid }) {
-		if (!hasRetentionPolicy(room)) {
-			throw new Meteor.Error('error-action-not-allowed', 'Room does not have retention policy', {
-				method: 'saveRoomSettings',
-				action: 'Editing_room',
-			});
-		}
-
-		if (!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) && value !== room.retention.ignoreThreads) {
+		if (
+			!(await hasPermissionAsync(userId, 'edit-room-retention-policy', rid)) &&
+			(!hasRetentionPolicy(room) || value !== room.retention.ignoreThreads)
+		) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing room retention policy is not allowed', {
 				method: 'saveRoomSettings',
 				action: 'Editing_room',
@@ -469,7 +449,7 @@ export async function saveRoomSettings(
 			rid,
 		});
 
-		if (setting === 'retentionOverrideGlobal') {
+		if (setting === 'retentionOverrideGlobal' && settings.retentionOverrideGlobal === false) {
 			delete settings.retentionMaxAge;
 			delete settings.retentionExcludePinned;
 			delete settings.retentionFilesOnly;

apps/meteor/ee/app/license/client/index.ts → apps/meteor/app/license/client/index.ts

@@ -1,5 +1,5 @@
-import { queryClient } from '../../../../client/lib/queryClient';
 import { fetchFeatures } from '../../../client/lib/fetchFeatures';
+import { queryClient } from '../../../client/lib/queryClient';
 
 export async function hasLicense(feature: string): Promise<boolean> {
 	try {

apps/meteor/ee/app/livechat-enterprise/client/index.ts → apps/meteor/app/livechat-enterprise/client/index.ts

@@ -1,5 +1,4 @@
 import { hasLicense } from '../../license/client';
-import '../lib/messageTypes';
 import './startup';
 
 void hasLicense('livechat-enterprise').then((enabled) => {

apps/meteor/ee/app/livechat-enterprise/lib/messageTypes.ts → apps/meteor/app/livechat-enterprise/client/messageTypes.ts

@@ -1,7 +1,26 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 
-import { MessageTypes } from '../../../../app/ui-utils/client';
-import { t } from '../../../../app/utils/lib/i18n';
+import { MessageTypes } from '../../ui-utils/client';
+import { t } from '../../utils/lib/i18n';
+
+MessageTypes.registerType({
+	id: 'livechat_transfer_history_fallback',
+	system: true,
+	message: 'New_chat_transfer_fallback',
+	data(message: any) {
+		if (!message.transferData) {
+			return {
+				fallback: 'SHOULD_NEVER_HAPPEN',
+			};
+		}
+		const from = message.transferData.prevDepartment;
+		const to = message.transferData.department.name;
+
+		return {
+			fallback: t('Livechat_transfer_failed_fallback', { from, to }),
+		};
+	},
+});
 
 MessageTypes.registerType({
 	id: 'omnichannel_priority_change_history',

apps/meteor/ee/app/livechat-enterprise/client/startup.ts → apps/meteor/app/livechat-enterprise/client/startup.ts

@@ -1,10 +1,10 @@
 import { Meteor } from 'meteor/meteor';
 
-import { businessHourManager } from '../../../../app/livechat/client/views/app/business-hours/BusinessHours';
-import type { IBusinessHourBehavior } from '../../../../app/livechat/client/views/app/business-hours/IBusinessHourBehavior';
-import { SingleBusinessHourBehavior } from '../../../../app/livechat/client/views/app/business-hours/Single';
-import { settings } from '../../../../app/settings/client';
 import { hasLicense } from '../../license/client';
+import { businessHourManager } from '../../livechat/client/views/app/business-hours/BusinessHours';
+import type { IBusinessHourBehavior } from '../../livechat/client/views/app/business-hours/IBusinessHourBehavior';
+import { SingleBusinessHourBehavior } from '../../livechat/client/views/app/business-hours/Single';
+import { settings } from '../../settings/client';
 import { MultipleBusinessHoursBehavior } from './views/business-hours/Multiple';
 
 const businessHours: Record<string, IBusinessHourBehavior> = {

apps/meteor/ee/app/livechat-enterprise/client/views/business-hours/Multiple.ts → apps/meteor/app/livechat-enterprise/client/views/business-hours/Multiple.ts

@@ -1,7 +1,7 @@
 import type { ILivechatBusinessHour } from '@rocket.chat/core-typings';
 import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 
-import type { IBusinessHourBehavior } from '../../../../../../app/livechat/client/views/app/business-hours/IBusinessHourBehavior';
+import type { IBusinessHourBehavior } from '../../../../livechat/client/views/app/business-hours/IBusinessHourBehavior';
 
 export class MultipleBusinessHoursBehavior implements IBusinessHourBehavior {
 	getView(): string {

apps/meteor/ee/app/livechat-enterprise/client/views/livechatSideNavItems.ts → apps/meteor/app/livechat-enterprise/client/views/livechatSideNavItems.ts

@@ -1,5 +1,5 @@
-import { hasPermission, hasAtLeastOnePermission } from '../../../../../app/authorization/client';
-import { registerOmnichannelSidebarItem } from '../../../../../client/views/omnichannel/sidebarItems';
+import { registerOmnichannelSidebarItem } from '../../../../client/views/omnichannel/sidebarItems';
+import { hasPermission, hasAtLeastOnePermission } from '../../../authorization/client';
 
 registerOmnichannelSidebarItem({
 	href: '/omnichannel/reports',

apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts

@@ -356,12 +356,6 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 			this.trySync();
 		});
 
-		if (!this.userRelated) {
-			return this.setupListener();
-		}
-
-		CachedCollectionManager.onLogin(async () => {
-			await this.setupListener();
-		});
+		return this.setupListener();
 	}
 }

apps/meteor/app/utils/client/lib/SDKClient.ts

@@ -51,6 +51,7 @@ type EventMap<N extends StreamNames = StreamNames, K extends StreamKeys<N> = Str
 
 type StreamMapValue = {
 	stop: () => void;
+	error: (cb: (...args: any[]) => void) => void;
 	onChange: ReturnType<ClientStream['subscribe']>['onChange'];
 	ready: () => Promise<void>;
 	isReady: boolean;
@@ -62,6 +63,7 @@ const createNewMeteorStream = (streamName: StreamNames, key: StreamKeys<StreamNa
 	const meta = {
 		ready: false,
 	};
+
 	const sub = Meteor.connection.subscribe(
 		`stream-${streamName}`,
 		key,
@@ -72,8 +74,8 @@ const createNewMeteorStream = (streamName: StreamNames, key: StreamKeys<StreamNa
 				ee.emit('ready', [undefined, args]);
 			},
 			onError: (err: any) => {
-				console.error(err);
 				ee.emit('ready', [err]);
+				ee.emit('error', err);
 			},
 		},
 	);
@@ -115,6 +117,11 @@ const createNewMeteorStream = (streamName: StreamNames, key: StreamKeys<StreamNa
 		stop: sub.stop,
 		onChange,
 		ready,
+		error: (cb: (...args: any[]) => void) =>
+			ee.once('error', (error) => {
+				cb(error);
+			}),
+
 		get isReady() {
 			return meta.ready;
 		},
@@ -179,6 +186,7 @@ const createStreamManager = () => {
 		if (!streams.has(eventLiteral)) {
 			streams.set(eventLiteral, stream);
 		}
+		stream.error(() => stop());
 
 		return {
 			id: '',