chore: Replace Meteor.userId() for client code (RocketChat#36911)

Author: tassoevan

apps/meteor/app/authorization/client/hasPermission.ts

@@ -1,8 +1,8 @@
 import type { IUser, IPermission } from '@rocket.chat/core-typings';
-import { Meteor } from 'meteor/meteor';
 
 import { hasRole } from './hasRole';
 import { PermissionsCachedStore } from '../../../client/cachedStores';
+import { watchUserId } from '../../../client/meteor/user';
 import { watch } from '../../../client/meteor/watch';
 import { Permissions, Users } from '../../../client/stores';
 import { AuthorizationUtils } from '../lib/AuthorizationUtils';
@@ -47,10 +47,10 @@ const validatePermissions = (
 		userId: IUser['_id'],
 		scopedRoles?: IPermission['_id'][],
 	) => boolean,
-	userId?: IUser['_id'] | null,
+	userId?: IUser['_id'],
 	scopedRoles?: IPermission['_id'][],
 ): boolean => {
-	userId = userId ?? Meteor.userId();
+	userId = userId ?? watchUserId() ?? undefined;
 
 	if (!userId) {
 		return false;
@@ -75,7 +75,7 @@ export const hasAtLeastOnePermission = (permissions: IPermission['_id'] | IPermi
 export const userHasAllPermission = (
 	permissions: IPermission['_id'] | IPermission['_id'][],
 	scope?: string,
-	userId?: IUser['_id'] | null,
+	userId?: IUser['_id'],
 ): boolean => validatePermissions(permissions, scope, all, userId);
 
 export const hasPermission = hasAllPermission;

apps/meteor/app/autotranslate/client/lib/autotranslate.ts

@@ -1,17 +1,12 @@
-import type {
-	IRoom,
-	ISubscription,
-	ISupportedLanguage,
-	ITranslatedMessage,
-	IUser,
-	MessageAttachmentDefault,
-} from '@rocket.chat/core-typings';
+import type { IRoom, ISubscription, ISupportedLanguage, ITranslatedMessage, MessageAttachmentDefault } from '@rocket.chat/core-typings';
 import { isTranslatedMessageAttachment } from '@rocket.chat/core-typings';
 import mem from 'mem';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { settings } from '../../../../client/lib/settings';
+import { getUserId } from '../../../../client/lib/user';
+import { watchUser, watchUserId } from '../../../../client/meteor/user';
 import { Messages, Subscriptions } from '../../../../client/stores';
 import {
 	hasTranslationLanguageInAttachments,
@@ -25,10 +20,9 @@ let username = '';
 
 Meteor.startup(() => {
 	Tracker.autorun(() => {
-		const user: Pick<IUser, 'language' | 'username'> | null = Meteor.user();
-		if (!user) {
-			return;
-		}
+		const user = watchUser();
+		if (!user) return;
+
 		userLanguage = user.language || 'en';
 		username = user.username || '';
 	});
@@ -102,7 +96,7 @@ export const AutoTranslate = {
 		}
 
 		Tracker.autorun(async (c) => {
-			const uid = Meteor.userId();
+			const uid = watchUserId();
 			if (!settings.watch('AutoTranslate_Enabled') || !uid || !hasPermission('auto-translate')) {
 				return;
 			}
@@ -132,7 +126,7 @@ export const createAutoTranslateMessageStreamHandler = (): ((message: ITranslate
 	AutoTranslate.init();
 
 	return (message: ITranslatedMessage): void => {
-		if (message.u && message.u._id !== Meteor.userId()) {
+		if (message.u && message.u._id !== getUserId()) {
 			const subscription = AutoTranslate.findSubscriptionByRid(message.rid);
 			const language = AutoTranslate.getLanguage(message.rid);
 			if (

apps/meteor/app/lib/client/methods/sendMessage.ts

@@ -1,26 +1,27 @@
-import type { IMessage, IUser } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
 import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
 import { settings } from '../../../../client/lib/settings';
 import { dispatchToastMessage } from '../../../../client/lib/toast';
+import { getUser, getUserId } from '../../../../client/lib/user';
 import { Messages, Rooms } from '../../../../client/stores';
 import { callbacks } from '../../../../lib/callbacks';
 import { trim } from '../../../../lib/utils/stringUtils';
 import { t } from '../../../utils/lib/i18n';
 
 Meteor.methods<ServerMethods>({
 	async sendMessage(message) {
-		const uid = Meteor.userId();
+		const uid = getUserId();
 		if (!uid || trim(message.msg) === '') {
 			return false;
 		}
 		const messageAlreadyExists = message._id && Messages.state.get(message._id);
 		if (messageAlreadyExists) {
 			return dispatchToastMessage({ type: 'error', message: t('Message_Already_Sent') });
 		}
-		const user = Meteor.user() as IUser | null;
+		const user = getUser();
 		if (!user?.username) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'sendMessage' });
 		}

apps/meteor/app/otr/client/OTRRoom.ts

@@ -9,6 +9,7 @@ import { Tracker } from 'meteor/tracker';
 
 import { Presence } from '../../../client/lib/presence';
 import { dispatchToastMessage } from '../../../client/lib/toast';
+import { getUser } from '../../../client/lib/user';
 import { getUidDirectMessage } from '../../../client/lib/utils/getUidDirectMessage';
 import { goToRoomById } from '../../../client/lib/utils/goToRoomById';
 import { Messages } from '../../../client/stores';
@@ -102,10 +103,9 @@ export class OTRRoom implements IOTRRoom {
 		]);
 
 		if (refresh) {
-			const user = Meteor.user();
-			if (!user) {
-				return;
-			}
+			const user = getUser();
+			if (!user) return;
+
 			await sdk.rest.post('/v1/chat.otr', {
 				roomId: this._roomId,
 				type: otrSystemMessages.USER_REQUESTED_OTR_KEY_REFRESH,

apps/meteor/app/reactions/client/methods/setReaction.ts

@@ -3,16 +3,17 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
+import { getUser, getUserId } from '../../../../client/lib/user';
 import { Rooms, Subscriptions, Messages } from '../../../../client/stores';
 import { emoji } from '../../../emoji/client';
 
 Meteor.methods<ServerMethods>({
 	async setReaction(reaction, messageId) {
-		if (!Meteor.userId()) {
+		if (!getUserId()) {
 			throw new Meteor.Error(203, 'User_logged_out');
 		}
 
-		const user = Meteor.user();
+		const user = getUser();
 
 		if (!user?.username) {
 			return false;

apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts

@@ -7,6 +7,7 @@ import type { MutableRefObject } from 'react';
 import { v4 as uuidv4 } from 'uuid';
 
 import { onClientMessageReceived } from '../../../../client/lib/onClientMessageReceived';
+import { getUserId } from '../../../../client/lib/user';
 import { callWithErrorHandling } from '../../../../client/lib/utils/callWithErrorHandling';
 import { getConfig } from '../../../../client/lib/utils/getConfig';
 import { waitForElement } from '../../../../client/lib/utils/waitForElement';
@@ -138,7 +139,7 @@ class RoomHistoryManagerClass extends Emitter {
 				({ ls } = subscription);
 			}
 
-			const showThreadsInMainChannel = getUserPreference(Meteor.userId(), 'showThreadsInMainChannel', false);
+			const showThreadsInMainChannel = getUserPreference(getUserId(), 'showThreadsInMainChannel', false);
 			const result = await callWithErrorHandling(
 				'loadHistory',
 				rid,

apps/meteor/app/ui/client/lib/ChatMessages.ts

@@ -25,7 +25,7 @@ type DeepWritable<T> = T extends (...args: any) => any
 		};
 
 export class ChatMessages implements ChatAPI {
-	public uid: string | null;
+	public uid: string | undefined;
 
 	public tmid?: IMessage['_id'];
 
@@ -142,7 +142,7 @@ export class ChatMessages implements ChatAPI {
 
 	public flows: DeepWritable<ChatAPI['flows']>;
 
-	public constructor(params: { rid: IRoom['_id']; tmid?: IMessage['_id']; uid: IUser['_id'] | null; actionManager: IActionManager }) {
+	public constructor(params: { rid: IRoom['_id']; tmid?: IMessage['_id']; uid: IUser['_id'] | undefined; actionManager: IActionManager }) {
 		const { rid, tmid } = params;
 		this.tmid = tmid;
 		this.uid = params.uid;

apps/meteor/app/ui/client/lib/UserAction.ts

@@ -1,9 +1,9 @@
 import type { IExtras, IRoomActivity, IUser } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { debounce } from 'lodash';
-import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../../client/lib/settings';
+import { getUser, getUserId } from '../../../../client/lib/user';
 import { Users } from '../../../../client/stores';
 import { sdk } from '../../../utils/client/lib/SDKClient';
 
@@ -40,7 +40,7 @@ const shownName = function (user: IUser | null | undefined): string | undefined
 
 const emitActivities = debounce(async (rid: string, extras: IExtras): Promise<void> => {
 	const activities = roomActivities.get(extras?.tmid || rid) || new Set();
-	sdk.publish('notify-room', [`${rid}/${USER_ACTIVITY}`, shownName(Meteor.user() as unknown as IUser), [...activities], extras]);
+	sdk.publish('notify-room', [`${rid}/${USER_ACTIVITY}`, shownName(getUser()), [...activities], extras]);
 }, 500);
 
 function handleStreamAction(rid: string, username: string, activityTypes: string[], extras?: IExtras): void {
@@ -74,7 +74,7 @@ export const UserAction = new (class {
 		}
 
 		const handler = function (username: string, activityType: string[], extras?: object): void {
-			const uid = Meteor.userId();
+			const uid = getUserId();
 			const user = uid ? Users.state.get(uid) : undefined;
 
 			if (username === shownName(user)) {

apps/meteor/app/utils/client/lib/getUserPreference.ts

@@ -9,7 +9,7 @@ import { Users } from '../../../../client/stores';
  * @param key The preference name
  * @returns The preference value
  */
-export function getUserPreference<TValue>(user: IUser['_id'] | null | undefined, key: string): TValue | undefined;
+export function getUserPreference<TValue>(user: IUser['_id'] | undefined, key: string): TValue | undefined;
 /**
  * Get a user preference
  * @param user The user
@@ -24,7 +24,7 @@ export function getUserPreference<TValue>(user: Pick<IUser, '_id' | 'settings'>
  * @param defaultValue The default value
  * @returns The preference value or the default value
  */
-export function getUserPreference<TValue>(user: IUser['_id'] | null | undefined, key: string, defaultValue: TValue): TValue;
+export function getUserPreference<TValue>(user: IUser['_id'] | undefined, key: string, defaultValue: TValue): TValue;
 /**
  * Get a user preference
  * @param user The user

apps/meteor/app/webrtc/client/WebRTCClass.ts

@@ -2,11 +2,11 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { StreamKeys, StreamNames, StreamerCallbackArgs } from '@rocket.chat/ddp-client';
 import { Emitter } from '@rocket.chat/emitter';
 import { GenericModal, imperativeModal } from '@rocket.chat/ui-client';
-import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 
 import { ChromeScreenShare } from './screenShare';
 import { settings } from '../../../client/lib/settings';
+import { getUserId } from '../../../client/lib/user';
 import { goToRoomById } from '../../../client/lib/utils/goToRoomById';
 import { Subscriptions, Users } from '../../../client/stores';
 import { sdk } from '../../utils/client/lib/SDKClient';
@@ -1035,31 +1035,28 @@ const WebRTC = new (class {
 			}
 			switch (subscription.t) {
 				case 'd':
-					enabled = settings.watch('WebRTC_Enable_Direct') ?? false;
+					enabled = settings.peek('WebRTC_Enable_Direct') ?? false;
 					break;
 				case 'p':
-					enabled = settings.watch('WebRTC_Enable_Private') ?? false;
+					enabled = settings.peek('WebRTC_Enable_Private') ?? false;
 					break;
 				case 'c':
-					enabled = settings.watch('WebRTC_Enable_Channel') ?? false;
+					enabled = settings.peek('WebRTC_Enable_Channel') ?? false;
 					break;
 				case 'l':
-					enabled = settings.watch<string>('Omnichannel_call_provider') === 'WebRTC';
+					enabled = settings.peek<string>('Omnichannel_call_provider') === 'WebRTC';
 			}
 		} else {
-			enabled = settings.watch<string>('Omnichannel_call_provider') === 'WebRTC';
+			enabled = settings.peek<string>('Omnichannel_call_provider') === 'WebRTC';
 		}
-		enabled = enabled && (settings.watch('WebRTC_Enabled') ?? false);
+		enabled = enabled && (settings.peek('WebRTC_Enabled') ?? false);
 		if (enabled === false) {
 			return;
 		}
 		if (this.instancesByRoomId[rid] == null) {
-			let uid = Meteor.userId()!;
-			let autoAccept = false;
-			if (visitorId) {
-				uid = visitorId;
-				autoAccept = true;
-			}
+			const uid = visitorId ?? getUserId();
+			if (!uid) return undefined;
+			const autoAccept = !!visitorId;
 			this.instancesByRoomId[rid] = new WebRTCClass(uid, rid, autoAccept);
 		}
 		return this.instancesByRoomId[rid];