chore!: Remove VoIP_TeamCollab_Enabled setting

.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',

ee/packages/media-calls/src/sip/Session.ts

@@ -116,7 +116,7 @@ export class SipServerSession {
 	}
 
 	private isEnabledOnSettings(settings: IMediaCallServerSettings): boolean {
-		return Boolean(settings.enabled && settings.sip.enabled && settings.sip.drachtio.host && settings.sip.drachtio.secret);
+		return Boolean(settings.sip.enabled && settings.sip.drachtio.host && settings.sip.drachtio.secret);
 	}
 
 	private initializeDrachtio(): void {

packages/i18n/src/locales/af.i18n.json

@@ -2292,7 +2292,6 @@
   "Visitor_Navigation": "Besoeker Navigasie",
   "Visitor_page_URL": "URL van besoekersbladsy",
   "Visitor_time_on_site": "Besoekers tyd op die webwerf",
-  "VoIP_TeamCollab_Enabled": "enabled",
   "Wait_activation_warning": "Voordat u kan inteken, moet u rekening handmatig deur 'n administrateur geaktiveer word.",
   "Warnings": "waarskuwings",
   "We_are_offline_Sorry_for_the_inconvenience": "Ons is vanlyn. Jammer vir die ongerief.",

packages/i18n/src/locales/ar.i18n.json

@@ -3972,7 +3972,6 @@
   "Visitor_message": "رسائل الزائر",
   "Visitor_page_URL": "عنوان URL لصفحة الزوار",
   "Visitor_time_on_site": "وقت الزائر في الموقع",
-  "VoIP_TeamCollab_Enabled": "تم التمكين",
   "Voice_Call": "مكالمة صوتية",
   "WAU_value": "WAU {{value}}",
   "Wait_activation_warning": "قبل أن تتمكن من تسجيل الدخول، يجب تفعيل حسابك يدويًا بواسطة المسؤول.",

packages/i18n/src/locales/az.i18n.json

@@ -2293,7 +2293,6 @@
   "Visitor_Navigation": "Ziyaretçi Naviqasiyası",
   "Visitor_page_URL": "Ziyaretçi səhifəsinin URL",
   "Visitor_time_on_site": "Saytda baxış zamanı",
-  "VoIP_TeamCollab_Enabled": "Etkin",
   "Wait_activation_warning": "Giriş yapabilmeniz üçün hesabınız bir administrator tərəfindən əl ilə aktivləşdirilməlidir.",
   "Warnings": "Uyarılar",
   "We_are_offline_Sorry_for_the_inconvenience": "Biz offline. Narahatçılığa görə üzr istəyirik.",

packages/i18n/src/locales/be-BY.i18n.json

@@ -2313,7 +2313,6 @@
   "Visitor_Navigation": "наведвальнік навігацыі",
   "Visitor_page_URL": "старонка наведвальнікаў URL",
   "Visitor_time_on_site": "Час для наведвальнікаў на сайце",
-  "VoIP_TeamCollab_Enabled": "Уключана",
   "Wait_activation_warning": "Перад тым, як увайсці, ваш уліковы запіс павінна быць актываваная ўручную адміністратарам.",
   "Warnings": "папярэджання",
   "We_are_offline_Sorry_for_the_inconvenience": "Мы не ў сеткі. Прабачце за дастаўленыя нязручнасці.",

packages/i18n/src/locales/bg.i18n.json

@@ -2288,7 +2288,6 @@
   "Visitor_Navigation": "Навигационна навигация",
   "Visitor_page_URL": "URL адрес на страницата на посетителя",
   "Visitor_time_on_site": "Време за посещение на място",
-  "VoIP_TeamCollab_Enabled": "Enabled",
   "Wait_activation_warning": "Преди да можете да влезете, вашият акаунт трябва да бъде активиран ръчно от администратор.",
   "Warnings": "Предопреждения",
   "We_are_offline_Sorry_for_the_inconvenience": "Ние сме офлайн. Съжалявам за неудобството.",

packages/i18n/src/locales/bs.i18n.json

@@ -2285,7 +2285,6 @@
   "Visitor_Navigation": "Navigacija Posjetitelja",
   "Visitor_page_URL": "URL stranice posjetitelja",
   "Visitor_time_on_site": "Vrijeme posjetitelja na stranici",
-  "VoIP_TeamCollab_Enabled": "Omogućeno",
   "Wait_activation_warning": "Prije nego što se prijavite, vaš račun mora ručno aktivirati administrator.",
   "Warnings": "Upozorenja",
   "We_are_offline_Sorry_for_the_inconvenience": "Mi smo izvan mreže. Oprostite na neugodnosti.",

packages/i18n/src/locales/ca.i18n.json

@@ -3891,7 +3891,6 @@
   "Visitor_message": "Missatges dels visitants",
   "Visitor_page_URL": "URL de la pàgina del visitant",
   "Visitor_time_on_site": "Temps de visita",
-  "VoIP_TeamCollab_Enabled": "Actiu",
   "WAU_value": "WAU {{value}}",
   "Wait_activation_warning": "Abans de poder iniciar sessió, els comptes han de ser activats manualment per un administrador.",
   "Waiting_queue": "Cua d’espera",

packages/i18n/src/locales/cs.i18n.json

@@ -3307,7 +3307,6 @@
   "Visitor_message": "Zprávy návštěvníků",
   "Visitor_page_URL": "URL Stránky pro návštěvníky",
   "Visitor_time_on_site": "Doba návštěvníka na stránce",
-  "VoIP_TeamCollab_Enabled": "Povoleno",
   "WAU_value": "WAU {{value}}",
   "Wait_activation_warning": "Předtím, než se můžete přihlásit, Váš účet musí být ručně aktivován správcem.",
   "Waiting_queue": "Čekací fronta",

packages/i18n/src/locales/cy.i18n.json

@@ -2286,7 +2286,6 @@
   "Visitor_Navigation": "Ymwelwyr Ymwelwyr",
   "Visitor_page_URL": "URL ymwelwyr tudalen",
   "Visitor_time_on_site": "Amser ymwelwyr ar y safle",
-  "VoIP_TeamCollab_Enabled": "Wedi'i alluogi",
   "Wait_activation_warning": "Cyn i chi allu mewngofnodi, rhaid i'ch gweinydd gael ei weithredu gan weinyddwr.",
   "Warnings": "Rhybuddion",
   "We_are_offline_Sorry_for_the_inconvenience": "Rydym ni allan. Mae'n ddrwg gennym am yr anghyfleustra.",

packages/i18n/src/locales/da.i18n.json

@@ -3402,7 +3402,6 @@
   "Visitor_message": "Besøgsmeddelelser",
   "Visitor_page_URL": "URL for besøgende side",
   "Visitor_time_on_site": "Besøgende tid på stedet",
-  "VoIP_TeamCollab_Enabled": "Aktiveret",
   "WAU_value": "WAU {{value}}",
   "Wait_activation_warning": "Før du kan logge ind, skal din konto manuelt aktiveres af en administrator.",
   "Waiting_queue": "Ventende kø",

packages/i18n/src/locales/de-AT.i18n.json

@@ -2292,7 +2292,6 @@
   "Visitor_Navigation": "Besuchernavigation",
   "Visitor_page_URL": "URL der Besucherseite",
   "Visitor_time_on_site": "Besucherzeit auf der Seite",
-  "VoIP_TeamCollab_Enabled": "aktiviert",
   "Wait_activation_warning": "Bevor Sie sich anmelden können, muss das Konto von einem Administrator manuell aktiviert werden.",
   "Warnings": "Warnungen",
   "We_are_offline_Sorry_for_the_inconvenience": "Wir sind offline. Entschuldigen Sie die Unannehmlichkeiten.",

packages/i18n/src/locales/de.i18n.json

@@ -4411,7 +4411,6 @@
   "Visitor_message": "Besuchernachrichten",
   "Visitor_page_URL": "URL der Besucherseite",
   "Visitor_time_on_site": "Besuchsdauer auf der Seite",
-  "VoIP_TeamCollab_Enabled": "Aktiviert",
   "Voice_Call": "Sprachanruf",
   "WAU_value": "WAU {{value}}",
   "Wait_activation_warning": "Bevor Sie sich anmelden können, muss das Konto von einem Administrator manuell aktiviert werden",

packages/i18n/src/locales/el.i18n.json

@@ -2294,7 +2294,6 @@
   "Visitor_Navigation": "επισκέπτης πλοήγησης",
   "Visitor_page_URL": "Διεύθυνση URL της σελίδας επισκέπτης",
   "Visitor_time_on_site": "επισκέπτη φορά στην ιστοσελίδα",
-  "VoIP_TeamCollab_Enabled": "Ενεργοποιημένο",
   "Wait_activation_warning": "Για να μπορέσετε να συνδεθείτε, ο λογαριασμός σας θα πρέπει να ενεργοποιηθεί χειροκίνητα από κάποιον διαχειριστή.",
   "Warnings": "Προειδοποιήσεις",
   "We_are_offline_Sorry_for_the_inconvenience": "Είμαστε εκτός σύνδεσης. Συγγνώμη για την ταλαιπωρία.",

packages/i18n/src/locales/en.i18n.json

@@ -5635,7 +5635,6 @@
   "VoIP_TeamCollab": "Team voice calls (VoIP)",
   "VoIP_TeamCollab_Beta_Alert": "This feature is currently in Beta, please report any issues to Rocket.Chat support",
   "VoIP_TeamCollab_Description": "Set up VoIP in Team collaboration",
-  "VoIP_TeamCollab_Enabled": "Enabled",
   "VoIP_TeamCollab_Feature1": "<0>Direct calling:</0> Instantly start or receive calls with team members within your Rocket.Chat workspace.",
   "VoIP_TeamCollab_Feature2": "<0>Extension management:</0> Admins can assign unique extensions to users, enabling quick, direct dialing both from inside and outside your organization.",
   "VoIP_TeamCollab_Feature3": "<0>Call transfers:</0> Seamlessly transfer active calls to ensure users reach the right team member.",

packages/i18n/src/locales/eo.i18n.json

@@ -2289,7 +2289,6 @@
   "Visitor_Navigation": "Vizitanto Navigado",
   "Visitor_page_URL": "Vizitanto paĝo URL",
   "Visitor_time_on_site": "Vizitanto tempo sur retejo",
-  "VoIP_TeamCollab_Enabled": "Enabled",
   "Wait_activation_warning": "Antaŭ ol vi povas ensaluti, via konto devas esti permane aktivigita de administranto.",
   "Warnings": "Avertoj",
   "We_are_offline_Sorry_for_the_inconvenience": "Ni estas eksterrete. Pardonu la malkomforton.",

packages/i18n/src/locales/es.i18n.json

@@ -4104,7 +4104,6 @@
   "Visitor_message": "Mensajes de visitantes",
   "Visitor_page_URL": "URL de la página del visitante",
   "Visitor_time_on_site": "Tiempo del visitante en el sitio",
-  "VoIP_TeamCollab_Enabled": "Habilitada",
   "Voice_Call": "Llamada de voz",
   "WAU_value": "WAU: {{value}}",
   "Wait_activation_warning": "Antes de poder iniciar sesión, un administrador debe activar tu cuenta manualmente.",

packages/i18n/src/locales/eu.i18n.json

@@ -105,7 +105,6 @@
   "User_joined_channel": "Kanalera batu da.",
   "User_left": "Erabiltzailea irten da",
   "Users": "Erabiltzaileak",
-  "VoIP_TeamCollab_Enabled": "Gaituta",
   "We_are_offline_Sorry_for_the_inconvenience": "Lineaz kanpo gaude. Barkatu eragozpenak.",
   "Yes": "Bai",
   "access-mailer_description": "Erabiltzaile guztiei mezu masiboa bidaltzeko baimena.",

packages/i18n/src/locales/fa.i18n.json

@@ -2576,7 +2576,6 @@
   "Visitor_Navigation": "کنترل های بازدید کننده",
   "Visitor_page_URL": "URL صفحه های بازدید کننده",
   "Visitor_time_on_site": "زمان بازدید کنندگان در سایت",
-  "VoIP_TeamCollab_Enabled": "فعال",
   "Wait_activation_warning": "قبل از اینکه شما می توانید وارد شوید، حساب خود را باید به صورت دستی توسط مدیر فعال می شود.",
   "Warnings": "اخطارها",
   "We_are_offline_Sorry_for_the_inconvenience": "متاسفانه ما برخط نیستیم.",

packages/i18n/src/locales/fi.i18n.json

@@ -4578,7 +4578,6 @@
   "Visitor_not_found": "Vierailijaa ei löydy",
   "Visitor_page_URL": "Vierailijan sivun URL",
   "Visitor_time_on_site": "Vierailijan aika sivustossa",
-  "VoIP_TeamCollab_Enabled": "Käytössä",
   "Voice_Call": "Äänipuhelu",
   "WAU_value": "WAU {{value}}",
   "Wait_activation_warning": "Ennen kuin voit kirjautua, järjestelmänvalvojan on aktivoitava tilisi manuaalisesti.",

packages/i18n/src/locales/fr.i18n.json

@@ -3977,7 +3977,6 @@
   "Visitor_message": "Messages du visiteur",
   "Visitor_page_URL": "URL de la page du visiteur",
   "Visitor_time_on_site": "Temps passé par le visiteur sur le site",
-  "VoIP_TeamCollab_Enabled": "Activé",
   "Voice_Call": "Appel vocal",
   "WAU_value": "{{value}} WAU",
   "Wait_activation_warning": "Avant que vous puissiez vous connecter, votre compte doit être activé manuellement par un administrateur.",

packages/i18n/src/locales/gl.i18n.json

@@ -248,7 +248,6 @@
   "User_Info": "Información do usuario",
   "Videocall_declined": "Videochamada rexeitada.",
   "Videocall_enabled": "Videochamada habilitada",
-  "VoIP_TeamCollab_Enabled": "Activado",
   "You_can_close_this_window_now": "Xa podes pechar esta ventá.",
   "You_can_use_an_emoji_as_avatar": "Tamén podes usar un emoji como avatar.",
   "You_can_use_webhooks_to_easily_integrate_livechat_with_your_CRM": "Podes usar webhooks para integrar facilmente o chat de vídeo co teu CRM.",

packages/i18n/src/locales/he.i18n.json

@@ -1297,7 +1297,6 @@
   "Visitor_Navigation": "ניווט גולשים",
   "Visitor_page_URL": "כתובת אתר של דף הגולש",
   "Visitor_time_on_site": "זמן גולש באתר",
-  "VoIP_TeamCollab_Enabled": "מופעל",
   "Wait_activation_warning": "לפני שתוכל להתחבר, החשבון שלך חייב לעבור אישור על ידי האדמין.",
   "We_are_offline_Sorry_for_the_inconvenience": "אנחנו במצב לא מקוון. מצטער על אי הנוחות.",
   "We_have_sent_password_email": "בדקות הקרובות אמורה להגיע אליך הודעה בדוא״ל עם הוראות לאיפוס הססמה. אם ההודעה לא מגיעה אליך, נא לנסות שוב.",

packages/i18n/src/locales/hi-IN.i18n.json

@@ -4891,7 +4891,6 @@
   "Visitor_not_found": "विज़िटर नहीं मिला",
   "Visitor_page_URL": "विज़िटर पृष्ठ URL",
   "Visitor_time_on_site": "साइट पर आगंतुक का समय",
-  "VoIP_TeamCollab_Enabled": "सक्रिय",
   "Voice_Call": "आवाज कॉल",
   "WAU_value": "मैं कद्र करता हूं {{value}}",
   "Wait_activation_warning": "इससे पहले कि आप लॉग इन कर सकें, आपका खाता किसी व्यवस्थापक द्वारा मैन्युअल रूप से सक्रिय होना चाहिए।",

packages/i18n/src/locales/hi.i18n.json

@@ -201,7 +201,6 @@
   "Type_your_name": "अपना नाम लिखें",
   "Upload_file_question": "दस्तावेज अपलोड करें?",
   "User_left": "उपयोगकर्ता छोड़ दिया",
-  "VoIP_TeamCollab_Enabled": "सक्रिय",
   "We_are_offline_Sorry_for_the_inconvenience": "हम ऑफ़लाइन हैं। असुविधा के लिए खेद है।",
   "Yes": "हाँ",
   "You": "आप",

packages/i18n/src/locales/hr.i18n.json

@@ -2409,7 +2409,6 @@
   "Visitor_Navigation": "Navigacija Posjetitelja",
   "Visitor_page_URL": "URL stranice posjetitelja",
   "Visitor_time_on_site": "Vrijeme posjetitelja na stranici",
-  "VoIP_TeamCollab_Enabled": "Omogućeno",
   "Wait_activation_warning": "Prije nego što se prijavite, vaš račun mora ručno aktivirati administrator.",
   "Warnings": "Upozorenja",
   "We_are_offline_Sorry_for_the_inconvenience": "Mi smo izvan mreže. Oprostite na neugodnosti.",