From 888a234bd35ef66fef6569c061860aba0890c1b7 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Thu, 6 Nov 2025 20:12:30 -0300
Subject: [PATCH] fix: LDAP Sync not updating user's VoIP Extensions (#37278)

---
 .changeset/famous-apricots-compare.md                  |  5 +++++
 .../server/classes/converters/UserConverter.ts         | 10 +++++++++-
 apps/meteor/server/lib/ldap/Manager.ts                 |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/famous-apricots-compare.md

diff --git a/.changeset/famous-apricots-compare.md b/.changeset/famous-apricots-compare.md
new file mode 100644
index 00000000000..0565b26e664
--- /dev/null
+++ b/.changeset/famous-apricots-compare.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue with LDAP Sync not updating user's VoIP Extensions
diff --git a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts
index 5074443c899..dbfbd9f0c94 100644
--- a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts
+++ b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts
@@ -24,6 +24,7 @@ export type UserConverterOptions = {
 
 	quickUserInsertion?: boolean;
 	enableEmail2fa?: boolean;
+	syncVoipExtension?: boolean;
 };
 
 export class UserConverter extends RecordConverter<IImportUserRecord, UserConverterOptions & RecordConverterOptions> {
@@ -280,7 +281,14 @@ export class UserConverter extends RecordConverter<IImportUserRecord, UserConver
 				...(userData.bio && { bio: userData.bio }),
 				...(userData.services?.ldap && { ldap: true }),
 				...(userData.avatarUrl && { _pendingAvatarUrl: userData.avatarUrl }),
+				...(this._options.syncVoipExtension && userData.voipExtension && { freeSwitchExtension: userData.voipExtension }),
 			}),
+			...(this._options.syncVoipExtension &&
+				!userData.voipExtension && {
+					$unset: {
+						freeSwitchExtension: 1,
+					},
+				}),
 		});
 
 		this.addCustomFields(updateData, userData);
@@ -353,7 +361,7 @@ export class UserConverter extends RecordConverter<IImportUserRecord, UserConver
 			...(userData.importIds?.length && { importIds: userData.importIds }),
 			...(!!userData.customFields && { customFields: userData.customFields }),
 			...(userData.deleted !== undefined && { active: !userData.deleted }),
-			...(userData.voipExtension !== undefined && { freeSwitchExtension: userData.voipExtension }),
+			...(this._options.syncVoipExtension && userData.voipExtension && { freeSwitchExtension: userData.voipExtension }),
 			...(userData.federated !== undefined && { federated: userData.federated }),
 		};
 	}
diff --git a/apps/meteor/server/lib/ldap/Manager.ts b/apps/meteor/server/lib/ldap/Manager.ts
index e5fbb310ab7..bb9002a0c9d 100644
--- a/apps/meteor/server/lib/ldap/Manager.ts
+++ b/apps/meteor/server/lib/ldap/Manager.ts
@@ -167,6 +167,7 @@ export class LDAPManager {
 			flagEmailsAsVerified: settings.get<boolean>('Accounts_Verify_Email_For_External_Accounts') ?? false,
 			skipExistingUsers: false,
 			skipUserCallbacks: false,
+			syncVoipExtension: Boolean(settings.get<string>('LDAP_Extension_Field')),
 		};
 	}