chore!: Remove VoIP_TeamCollab_Enabled setting (#36941)

Co-authored-by: Pierre Lehnen <[email protected]>

Author: 2 people

.changeset/cool-turtles-bathe.md

@@ -0,0 +1,7 @@
+---
+'@rocket.chat/meteor': major
+'@rocket.chat/media-calls': minor
+'@rocket.chat/i18n': minor
+---
+
+Makes Voice Calls enabled by default when available

apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts

@@ -13,7 +13,7 @@ const isEditingUserRoles = (previousRoles: IUser['roles'], newRoles?: IUser['rol
 const isEditingField = (previousValue?: string, newValue?: string) => typeof newValue !== 'undefined' && newValue !== previousValue;
 
 export const canEditExtension = async (newExtension?: string) => {
-	if (!settings.get('VoIP_TeamCollab_Enabled')) {
+	if (!settings.get('VoIP_TeamCollab_SIP_Integration_Enabled')) {
 		return false;
 	}
 

apps/meteor/client/views/admin/users/useShowVoipExtension.tsx

@@ -1,7 +1,7 @@
 import { useSetting } from '@rocket.chat/ui-contexts';
 
 export const useShowVoipExtension = () => {
-	const isVoipSettingEnabled = useSetting('VoIP_TeamCollab_Enabled', false);
+	const isVoipSettingEnabled = useSetting('VoIP_TeamCollab_SIP_Integration_Enabled', false);
 
 	return isVoipSettingEnabled;
 };

apps/meteor/ee/server/settings/voip.ts

@@ -6,30 +6,20 @@ export function addSettings(): Promise<void> {
 			{
 				enterprise: true,
 				modules: ['teams-voip'],
+				alert: 'VoIP_TeamCollab_Beta_Alert',
 			},
 			async function () {
-				const enableQuery = { _id: 'VoIP_TeamCollab_Enabled', value: true };
-
-				await this.add('VoIP_TeamCollab_Enabled', false, {
-					type: 'boolean',
-					public: true,
-					invalidValue: false,
-					alert: 'VoIP_TeamCollab_Beta_Alert',
-				});
-
 				await this.section('VoIP_TeamCollab_WebRTC', async function () {
 					await this.add('VoIP_TeamCollab_Ice_Servers', 'stun:stun.l.google.com:19302', {
 						type: 'string',
 						public: true,
 						invalidValue: '',
-						enableQuery,
 					});
 
 					await this.add('VoIP_TeamCollab_Ice_Gathering_Timeout', 5000, {
 						type: 'int',
 						public: true,
 						invalidValue: 5000,
-						enableQuery,
 					});
 				});
 
@@ -50,35 +40,30 @@ export function addSettings(): Promise<void> {
 						type: 'string',
 						public: false,
 						invalidValue: '',
-						enableQuery,
 					});
 
 					await this.add('VoIP_TeamCollab_Drachtio_Port', 9022, {
 						type: 'int',
 						public: false,
 						invalidValue: 9022,
-						enableQuery,
 					});
 
 					await this.add('VoIP_TeamCollab_Drachtio_Password', '', {
 						type: 'password',
 						secret: true,
 						invalidValue: '',
-						enableQuery,
 					});
 
 					await this.add('VoIP_TeamCollab_SIP_Server_Host', '', {
 						type: 'string',
 						public: false,
 						invalidValue: '',
-						enableQuery,
 					});
 
 					await this.add('VoIP_TeamCollab_SIP_Server_Port', 5060, {
 						type: 'int',
 						public: false,
 						invalidValue: 5060,
-						enableQuery,
 					});
 				});
 			},

apps/meteor/server/services/media-call/service.ts

@@ -282,12 +282,10 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 	}
 
 	private getMediaServerSettings(): IMediaCallServerSettings {
-		const enabled = settings.get<boolean>('VoIP_TeamCollab_Enabled') ?? false;
-		const sipEnabled = enabled && (settings.get<boolean>('VoIP_TeamCollab_SIP_Integration_Enabled') ?? false);
+		const sipEnabled = settings.get<boolean>('VoIP_TeamCollab_SIP_Integration_Enabled') ?? false;
 		const forceSip = sipEnabled && (settings.get<boolean>('VoIP_TeamCollab_SIP_Integration_For_Internal_Calls') ?? false);
 
 		return {
-			enabled,
 			internalCalls: {
 				requireExtensions: forceSip,
 				routeExternally: forceSip ? 'always' : 'never',

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

@@ -34,5 +34,6 @@ import './v325';
 import './v326';
 import './v327';
 import './v328';
+import './v329';
 
 export * from './xrun';

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

@@ -0,0 +1,11 @@
+import { Settings } from '@rocket.chat/models';
+
+import { addMigration } from '../../lib/migrations';
+
+addMigration({
+	version: 329,
+	name: 'Remove VoIP Toggle Setting',
+	async up() {
+		await Settings.deleteOne({ _id: 'VoIP_TeamCollab_Enabled' });
+	},
+});

apps/meteor/tests/end-to-end/api/users.ts

@@ -579,11 +579,11 @@ describe('[Users]', () => {
 
 		(IS_EE ? describe : describe.skip)('Voice call extension', () => {
 			beforeEach(async () => {
-				await updateSetting('VoIP_TeamCollab_Enabled', true);
+				await updateSetting('VoIP_TeamCollab_SIP_Integration_Enabled', true);
 			});
 
 			after(async () => {
-				await updateSetting('VoIP_TeamCollab_Enabled', true);
+				await updateSetting('VoIP_TeamCollab_SIP_Integration_Enabled', true);
 			});
 
 			it('should create a user with a voice call extension', async () => {
@@ -644,7 +644,7 @@ describe('[Users]', () => {
 			});
 
 			it('should not create a user if voip is disabled', async () => {
-				await updateSetting('VoIP_TeamCollab_Enabled', false);
+				await updateSetting('VoIP_TeamCollab_SIP_Integration_Enabled', false);
 				await request
 					.post(api('users.create'))
 					.set(credentials)
@@ -2530,11 +2530,11 @@ describe('[Users]', () => {
 			});
 
 			after(async () => {
-				await Promise.all([deleteUser(user), updateSetting('VoIP_TeamCollab_Enabled', true)]);
+				await Promise.all([deleteUser(user), updateSetting('VoIP_TeamCollab_SIP_Integration_Enabled', true)]);
 			});
 
 			beforeEach(async () => {
-				await Promise.all([updateSetting('VoIP_TeamCollab_Enabled', true)]);
+				await Promise.all([updateSetting('VoIP_TeamCollab_SIP_Integration_Enabled', true)]);
 			});
 
 			it("should update the user's voice call extension", async () => {
@@ -2572,7 +2572,7 @@ describe('[Users]', () => {
 			});
 
 			it("should not update the user's voice call extension if voip setting is disabled", async () => {
-				await updateSetting('VoIP_TeamCollab_Enabled', false);
+				await updateSetting('VoIP_TeamCollab_SIP_Integration_Enabled', false);
 				await request
 					.post(api('users.update'))
 					.set(credentials)

ee/packages/media-calls/src/definition/IMediaCallServer.ts

@@ -11,8 +11,6 @@ export type MediaCallServerEvents = {
 };
 
 export interface IMediaCallServerSettings {
-	enabled: boolean;
-
 	internalCalls: {
 		requireExtensions: boolean;
 		routeExternally: 'never' | 'preferably' | 'always';

ee/packages/media-calls/src/server/getDefaultSettings.ts

@@ -2,7 +2,6 @@ import type { IMediaCallServerSettings } from '../definition/IMediaCallServer';
 
 export function getDefaultSettings(): IMediaCallServerSettings {
 	return {
-		enabled: false,
 		internalCalls: {
 			requireExtensions: false,
 			routeExternally: 'never',