chore: Improper calls to `Meteor.userId()` in React components (#36775)

pull/36733/head^2
Tasso Evangelista 10 months ago committed by GitHub
parent 34f05ee69d
commit 776af0ae53
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 8
      apps/meteor/client/views/meet/MeetPage.tsx
  2. 4
      apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx
  3. 3
      apps/meteor/client/views/setupWizard/providers/SetupWizardProvider.tsx

@ -1,7 +1,6 @@
import { Button, Box, Flex } from '@rocket.chat/fuselage';
import { UserAvatar } from '@rocket.chat/ui-avatar';
import { useRouteParameter, useSearchParameter } from '@rocket.chat/ui-contexts';
import { Meteor } from 'meteor/meteor';
import { useRouteParameter, useSearchParameter, useUserId } from '@rocket.chat/ui-contexts';
import { useEffect, useState, useCallback } from 'react';
import { useTranslation } from 'react-i18next';
@ -23,6 +22,7 @@ const MeetPage = () => {
const [visitorName, setVisitorName] = useState('');
const [agentName, setAgentName] = useState('');
const [callStartTime, setCallStartTime] = useState(undefined);
const userId = useUserId();
const isMobileDevice = (): boolean => window.innerWidth <= 450;
const closeCallTab = (): void => window.close();
@ -52,14 +52,14 @@ const MeetPage = () => {
}
const room = (await sdk.rest.get('/v1/rooms.info', { roomId })) as any;
if (room?.room?.servedBy?._id === Meteor.userId()) {
if (room?.room?.servedBy?._id === userId) {
setVisitorName(room.room.fname);
room?.room?.responseBy?.username ? setAgentName(room.room.responseBy.username) : setAgentName(room.room.servedBy.username);
setStatus(room?.room?.callStatus || 'ended');
setCallStartTime(room.room.webRtcCallStartTime);
return setIsRoomMember(true);
}
}, [roomId]);
}, [roomId, userId]);
useEffect(() => {
if (visitorToken) {

@ -9,9 +9,9 @@ import {
useTranslation,
usePermission,
useEndpoint,
useUserId,
} from '@rocket.chat/ui-contexts';
import { useQuery } from '@tanstack/react-query';
import { Meteor } from 'meteor/meteor';
import moment from 'moment';
import { useMemo } from 'react';
@ -74,7 +74,7 @@ function ChatInfo({ id, route }: ChatInfoProps) {
const canViewCustomFields = usePermission('view-livechat-room-customfields');
const subscription = useUserSubscription(id);
const hasGlobalEditRoomPermission = usePermission('save-others-livechat-room-info');
const hasLocalEditRoomPermission = servedBy?._id === Meteor.userId();
const hasLocalEditRoomPermission = servedBy?._id === useUserId();
const visitorId = v?._id;
const queueStartedAt = queuedAt || ts;

@ -10,7 +10,6 @@ import {
useTranslation,
} from '@rocket.chat/ui-contexts';
import { useQueryClient } from '@tanstack/react-query';
import { Meteor } from 'meteor/meteor';
import type { ReactElement, ContextType } from 'react';
import { useCallback, useMemo, useState } from 'react';
@ -87,7 +86,7 @@ const SetupWizardProvider = ({ children }: { children: ReactElement }): ReactEle
try {
await loginWithPassword(email, password);
} catch (error) {
if (error instanceof Meteor.Error && error.error === 'error-invalid-email') {
if ((error as { error?: unknown }).error === 'error-invalid-email') {
dispatchToastMessage({ type: 'success', message: t('We_have_sent_registration_email') });
return;
}

Loading…
Cancel
Save