From 53237062a066761bd358ba29c985a58f457a249b Mon Sep 17 00:00:00 2001
From: Kevin Aleman <kevin.aleman@rocket.chat>
Date: Tue, 8 Mar 2022 12:25:28 -0600
Subject: [PATCH] Show call icon only when user has extension associated

---
 app/lib/server/functions/getFullUserData.js          | 2 +-
 app/utils/server/functions/getDefaultUserFields.ts   | 1 +
 client/providers/CallProvider/CallProvider.tsx       | 7 +++++++
 client/providers/CallProvider/hooks/useVoipClient.ts | 2 +-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/lib/server/functions/getFullUserData.js b/app/lib/server/functions/getFullUserData.js
index 6fdfca9d7c01..d328f3b05832 100644
--- a/app/lib/server/functions/getFullUserData.js
+++ b/app/lib/server/functions/getFullUserData.js
@@ -17,6 +17,7 @@ const defaultFields = {
 	reason: 1,
 	statusText: 1,
 	avatarETag: 1,
+	extension: 1,
 };
 
 const fullFields = {
@@ -30,7 +31,6 @@ const fullFields = {
 	requirePasswordChange: 1,
 	requirePasswordChangeReason: 1,
 	roles: 1,
-	extension: 1,
 };
 
 let publicCustomFields = {};
diff --git a/app/utils/server/functions/getDefaultUserFields.ts b/app/utils/server/functions/getDefaultUserFields.ts
index 60b163e34dc6..574d118198b4 100644
--- a/app/utils/server/functions/getDefaultUserFields.ts
+++ b/app/utils/server/functions/getDefaultUserFields.ts
@@ -36,4 +36,5 @@ export const getDefaultUserFields = (): DefaultUserFields => ({
 	'oauth.authorizedClients': 1,
 	'_updatedAt': 1,
 	'avatarETag': 1,
+	'extension': 1,
 });
diff --git a/client/providers/CallProvider/CallProvider.tsx b/client/providers/CallProvider/CallProvider.tsx
index 14ec7d084bc6..ce7775536a6c 100644
--- a/client/providers/CallProvider/CallProvider.tsx
+++ b/client/providers/CallProvider/CallProvider.tsx
@@ -241,6 +241,13 @@ export const CallProvider: FC = ({ children }) => {
 			};
 		}
 
+		if (!user?.extension) {
+			return {
+				enabled: false,
+				ready: false,
+			};
+		}
+
 		if (isUseVoipClientResultError(result)) {
 			return {
 				enabled: true,
diff --git a/client/providers/CallProvider/hooks/useVoipClient.ts b/client/providers/CallProvider/hooks/useVoipClient.ts
index 7c3dd350c6cb..65d4293a37b4 100644
--- a/client/providers/CallProvider/hooks/useVoipClient.ts
+++ b/client/providers/CallProvider/hooks/useVoipClient.ts
@@ -38,7 +38,7 @@ export const useVoipClient = (): UseVoipClientResult => {
 	const [result, setResult] = useSafely(useState<UseVoipClientResult>({}));
 
 	useEffect(() => {
-		if (!user || !user?._id || !voipEnabled) {
+		if (!user || !user?._id || !user?.extension || !voipEnabled) {
 			setResult({});
 			return;
 		}