Merge remote-tracking branch 'origin/release-7.0.0' into migration-to…

…-remove-redundant-indexes

.changeset/rare-hats-lie.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": major
+---
+
+Changes End-to-end encryption default setting to enable mention in encrypted messages

apps/meteor/server/settings/e2e.ts

@@ -36,7 +36,7 @@ export const createE2ESettings = () =>
 			enableQuery: { _id: 'E2E_Enable', value: true },
 		});
 
-		await this.add('E2E_Enabled_Mentions', false, {
+		await this.add('E2E_Enabled_Mentions', true, {
 			type: 'boolean',
 			public: true,
 			enableQuery: { _id: 'E2E_Enable', value: true },

apps/meteor/server/startup/migrations/index.ts

@@ -44,5 +44,6 @@ import './v308';
 import './v309';
 import './v310';
 import './v311';
+import './v312';
 
 export * from './xrun';

apps/meteor/server/startup/migrations/v311.ts

@@ -1,20 +1,21 @@
-import { LivechatRooms, Rooms, Subscriptions, Users } from '@rocket.chat/models';
+import { Settings } from '@rocket.chat/models';
 
 import { addMigration } from '../../lib/migrations';
 
 addMigration({
 	version: 311,
+	name: 'Update default behavior of E2E_Enabled_Mentions setting, to allow mentions in encrypted messages by default.',
 	async up() {
-		try {
-			await Promise.allSettled([
-				LivechatRooms.col.dropIndex('v.token_1'),
-				Rooms.col.dropIndex('t_1'),
-				Subscriptions.col.dropIndex('rid_1'),
-				Users.col.dropIndex('active_1'),
-			]);
-		} catch (error: unknown) {
-			console.warn('Error dropping redundant indexes, continuing...');
-			console.warn(error);
-		}
+		await Settings.updateOne(
+			{
+				_id: 'E2E_Enabled_Mentions',
+			},
+			{
+				$set: {
+					value: true,
+					packageValue: true,
+				},
+			},
+		);
 	},
 });

apps/meteor/server/startup/migrations/v312.ts

@@ -0,0 +1,20 @@
+import { LivechatRooms, Rooms, Subscriptions, Users } from '@rocket.chat/models';
+
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 312,
+	async up() {
+		try {
+			await Promise.allSettled([
+				LivechatRooms.col.dropIndex('v.token_1'),
+				Rooms.col.dropIndex('t_1'),
+				Subscriptions.col.dropIndex('rid_1'),
+				Users.col.dropIndex('active_1'),
+			]);
+		} catch (error: unknown) {
+			console.warn('Error dropping redundant indexes, continuing...');
+			console.warn(error);
+		}
+	},
+});

apps/meteor/tests/e2e/e2e-encryption.spec.ts

@@ -133,13 +133,11 @@ test.describe.serial('e2e-encryption', () => {
 
 	test.beforeAll(async ({ api }) => {
 		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true })).status()).toBe(200);
-		expect((await api.post('/settings/E2E_Enabled_Mentions', { value: true })).status()).toBe(200);
 	});
 
 	test.afterAll(async ({ api }) => {
 		expect((await api.post('/settings/E2E_Enable', { value: false })).status()).toBe(200);
 		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
-		expect((await api.post('/settings/E2E_Enabled_Mentions', { value: false })).status()).toBe(200);
 	});
 
 	test('expect create a private channel encrypted and send an encrypted message', async ({ page }) => {