From 539660c17c1854f6c77f2e9ea7f1c79a7f5db651 Mon Sep 17 00:00:00 2001
From: Pierre Lehnen <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:33:17 +0000
Subject: [PATCH] fix: videoconf ringer not working after a temporary
 disconnection (#35330)

---
 .changeset/angry-colts-worry.md            |  5 +++++
 apps/meteor/client/lib/VideoConfManager.ts | 21 ++++++++++++---------
 2 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 .changeset/angry-colts-worry.md

diff --git a/.changeset/angry-colts-worry.md b/.changeset/angry-colts-worry.md
new file mode 100644
index 0000000000000..88598070bf2ee
--- /dev/null
+++ b/.changeset/angry-colts-worry.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+fixes an issue where videoconf calls could sometimes fail to ring an user after a temporary disconnection
diff --git a/apps/meteor/client/lib/VideoConfManager.ts b/apps/meteor/client/lib/VideoConfManager.ts
index 6cb0e67a59995..7112d405b9f61 100644
--- a/apps/meteor/client/lib/VideoConfManager.ts
+++ b/apps/meteor/client/lib/VideoConfManager.ts
@@ -305,17 +305,16 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 	public updateUser(): void {
 		const userId = Meteor.userId();
 
-		if (this.userId === userId) {
-			this.debugLog(`[VideoConf] Logged user has not changed, so we're not changing the hooks.`);
-			return;
-		}
-
-		this.debugLog(`[VideoConf] Logged user has changed.`);
+		this.debugLog(`[VideoConf] Logged user or connection status has changed.`);
 
 		if (this.userId) {
-			this.disconnect();
+			this.disconnect(this.userId !== userId);
 		}
 
+		if (!Meteor.status().connected || (userId && Meteor.loggingIn())) {
+			this.debugLog(`[VideoConf] Connection lost or login process still pending, skipping user change.`);
+			return;
+		}
 		if (userId) {
 			this.connectUser(userId);
 		}
@@ -458,12 +457,17 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 		sdk.rest.post('/v1/video-conference.cancel', { callId });
 	}
 
-	private disconnect(): void {
+	private disconnect(clearCalls = true): void {
 		console.log(`[VideoConf] disconnecting user ${this.userId}`);
 		for (const hook of this.hooks) {
 			hook();
 		}
 		this.hooks = [];
+		this.userId = undefined;
+
+		if (!clearCalls) {
+			return;
+		}
 
 		if (this.currentCallHandler) {
 			clearInterval(this.currentCallHandler);
@@ -478,7 +482,6 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 				clearTimeout(call.acceptTimeout);
 			}
 		});
-		this.userId = undefined;
 		this.incomingDirectCalls.clear();
 		this.dismissedCalls.clear();
 		this.currentCallData = undefined;