Merge branch 'develop' into test/decouple-teams

.changeset/cuddly-maps-peel.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixed streams being called when the user is not logged in

apps/meteor/client/hooks/useVoipClient.ts

@@ -39,13 +39,13 @@ export const useVoipClient = (): UseVoipClientResult => {
 	const isEE = useHasLicenseModule('voip-enterprise');
 	const voipEnabled = settingVoipEnabled && voipConnectorEnabled;
 
-	useEffect(
-		() =>
-			subscribeToNotifyLoggedIn(`voip.statuschanged`, (enabled: boolean): void => {
+	useEffect(() => {
+		if (user) {
+			return subscribeToNotifyLoggedIn(`voip.statuschanged`, (enabled: boolean): void => {
 				setVoipConnectorEnabled(enabled);
-			}),
-		[setResult, setVoipConnectorEnabled, subscribeToNotifyLoggedIn],
-	);
+			});
+		}
+	}, [setResult, setVoipConnectorEnabled, subscribeToNotifyLoggedIn, user]);
 
 	useEffect(() => {
 		const uid = user?._id;

apps/meteor/client/providers/EmojiPickerProvider/useUpdateCustomEmoji.ts

@@ -1,17 +1,22 @@
-import { useStream } from '@rocket.chat/ui-contexts';
+import { useStream, useUserId } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
 import { updateEmojiCustom, deleteEmojiCustom } from '../../../app/emoji-custom/client/lib/emojiCustom';
 
 export const useUpdateCustomEmoji = () => {
 	const notify = useStream('notify-logged');
+	const uid = useUserId();
 	useEffect(() => {
+		if (!uid) {
+			return;
+		}
+
 		const unsubUpdate = notify('updateEmojiCustom', (data) => updateEmojiCustom(data.emojiData));
 		const unsubDelete = notify('deleteEmojiCustom', (data) => deleteEmojiCustom(data.emojiData));
 
 		return () => {
 			unsubUpdate();
 			unsubDelete();
 		};
-	}, [notify]);
+	}, [notify, uid]);
 };

apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts

@@ -1,12 +1,16 @@
-import { useStream } from '@rocket.chat/ui-contexts';
+import { useStream, useUserId } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
 import { ChatMessage } from '../../../../app/models/client';
 
 export const useDeleteUser = () => {
 	const notify = useStream('notify-logged');
 
+	const uid = useUserId();
 	useEffect(() => {
+		if (!uid) {
+			return;
+		}
 		return notify('Users:Deleted', ({ userId, messageErasureType, replaceByUser }) => {
 			if (messageErasureType === 'Unlink' && replaceByUser) {
 				return ChatMessage.update(
@@ -28,5 +32,5 @@ export const useDeleteUser = () => {
 				'u._id': userId,
 			});
 		});
-	}, [notify]);
+	}, [notify, uid]);
 };

apps/meteor/client/providers/UserProvider/hooks/useUpdateAvatar.ts

@@ -1,15 +1,19 @@
-import { useStream } from '@rocket.chat/ui-contexts';
+import { useUserId, useStream } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 import { useEffect } from 'react';
 
 export const useUpdateAvatar = () => {
 	const notify = useStream('notify-logged');
+	const uid = useUserId();
 	useEffect(() => {
+		if (!uid) {
+			return;
+		}
 		return notify('updateAvatar', (data) => {
 			if ('username' in data) {
 				const { username, etag } = data;
 				username && Meteor.users.update({ username }, { $set: { avatarETag: etag } });
 			}
 		});
-	}, [notify]);
+	}, [notify, uid]);
 };

apps/meteor/client/startup/notifications/konchatNotifications.ts

@@ -72,6 +72,7 @@ Meteor.startup(() => {
 	Tracker.autorun(() => {
 		if (!Meteor.userId() || !settings.get('Outlook_Calendar_Enabled')) {
 			sdk.stop('notify-user', `${Meteor.userId()}/calendar`);
+			return;
 		}
 
 		sdk.stream('notify-user', [`${Meteor.userId()}/calendar`], notifyUserCalendar);

apps/meteor/tests/e2e/omnichannel/omnichannel-manual-selection-logout.spec.ts

@@ -10,7 +10,7 @@ import { test, expect } from '../utils/test';
 
 test.use({ storageState: Users.user1.state });
 
-test.describe('OC - Manual Selection', () => {
+test.describe('OC - Manual Selection After Relogin', () => {
 	let poOmnichannel: HomeOmnichannel;
 	let agent: Awaited<ReturnType<typeof createAgent>>;