[pull] develop from RocketChat:develop

.changeset/mean-eagles-complain.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes a variable shadowing issue preventing new visitor registration in `livechat/messages` API.

apps/meteor/app/api/server/v1/channels.ts

@@ -22,9 +22,9 @@ import {
 	isChannelsFilesListProps,
 	isChannelsOnlineProps,
 } from '@rocket.chat/rest-typings';
+import { isTruthy } from '@rocket.chat/tools';
 import { Meteor } from 'meteor/meteor';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { eraseRoom } from '../../../../server/lib/eraseRoom';
 import { findUsersOfRoom } from '../../../../server/lib/findUsersOfRoom';
 import { openRoom } from '../../../../server/lib/openRoom';

apps/meteor/app/api/server/v1/groups.ts

@@ -2,11 +2,11 @@ import { Team, isMeteorError } from '@rocket.chat/core-services';
 import type { IIntegration, IUser, IRoom, RoomType, UserStatus } from '@rocket.chat/core-typings';
 import { Integrations, Messages, Rooms, Subscriptions, Uploads, Users } from '@rocket.chat/models';
 import { isGroupsOnlineProps, isGroupsMessagesProps, isGroupsFilesProps } from '@rocket.chat/rest-typings';
+import { isTruthy } from '@rocket.chat/tools';
 import { check, Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import type { Filter } from 'mongodb';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { eraseRoom } from '../../../../server/lib/eraseRoom';
 import { findUsersOfRoom } from '../../../../server/lib/findUsersOfRoom';
 import { openRoom } from '../../../../server/lib/openRoom';

apps/meteor/app/api/server/v1/rooms.ts

@@ -19,9 +19,9 @@ import {
 	validateBadRequestErrorResponse,
 	validateUnauthorizedErrorResponse,
 } from '@rocket.chat/rest-typings';
+import { isTruthy } from '@rocket.chat/tools';
 import { Meteor } from 'meteor/meteor';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { adminFields } from '../../../../lib/rooms/adminFields';
 import { omit } from '../../../../lib/utils/omit';
 import * as dataExport from '../../../../server/lib/dataExport';

apps/meteor/app/apps/server/bridges/internal.ts

@@ -2,8 +2,8 @@ import type { IAppServerOrchestrator, IAppsSetting } from '@rocket.chat/apps';
 import { InternalBridge } from '@rocket.chat/apps-engine/server/bridges/InternalBridge';
 import type { ISetting, ISubscription } from '@rocket.chat/core-typings';
 import { Settings, Subscriptions } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { deasyncPromise } from '../../../../server/deasync/deasync';
 
 export class AppInternalBridge extends InternalBridge {

apps/meteor/app/autotranslate/server/autotranslate.ts

@@ -10,10 +10,10 @@ import type {
 import { Logger } from '@rocket.chat/logger';
 import { Messages, Subscriptions } from '@rocket.chat/models';
 import { escapeHTML } from '@rocket.chat/string-helpers';
+import { isTruthy } from '@rocket.chat/tools';
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { isTruthy } from '../../../lib/isTruthy';
 import { callbacks } from '../../../server/lib/callbacks';
 import { notifyOnMessageChange } from '../../lib/server/lib/notifyListener';
 import { Markdown } from '../../markdown/server';

apps/meteor/app/lib/server/functions/createDirectRoom.ts

@@ -4,10 +4,10 @@ import type { ISubscriptionExtraData } from '@rocket.chat/core-services';
 import type { ICreatedRoom, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
 import { Rooms, Subscriptions, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
+import { isTruthy } from '@rocket.chat/tools';
 import { Meteor } from 'meteor/meteor';
 import type { MatchKeysAndValues } from 'mongodb';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { callbacks } from '../../../../server/lib/callbacks';
 import { getNameForDMs } from '../../../../server/services/room/getNameForDMs';
 import { settings } from '../../../settings/server';

apps/meteor/app/lib/server/startup/mentionUserNotInChannel.ts

@@ -2,10 +2,10 @@ import { api } from '@rocket.chat/core-services';
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isEditedMessage, isOmnichannelRoom, isRoomFederated, getUserDisplayName } from '@rocket.chat/core-typings';
 import { Subscriptions, Users } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 import type { ActionsBlock } from '@rocket.chat/ui-kit';
 import moment from 'moment';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { callbacks } from '../../../../server/lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';

apps/meteor/app/livechat/imports/server/rest/appearance.ts

@@ -1,8 +1,8 @@
 import type { ISettingSelectOption } from '@rocket.chat/core-typings';
 import { Settings } from '@rocket.chat/models';
 import { isPOSTLivechatAppearanceParams } from '@rocket.chat/rest-typings';
+import { isTruthy } from '@rocket.chat/tools';
 
-import { isTruthy } from '../../../../../lib/isTruthy';
 import { updateAuditedByUser } from '../../../../../server/settings/lib/auditedSettingUpdates';
 import { API } from '../../../../api/server';
 import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';

apps/meteor/app/livechat/server/api/v1/message.ts

@@ -253,7 +253,7 @@ API.v1.addRoute(
 		async post() {
 			const visitorToken = this.bodyParams.visitor.token;
 
-			const visitor = await LivechatVisitors.getVisitorByToken(visitorToken, {});
+			let visitor = await LivechatVisitors.getVisitorByToken(visitorToken, {});
 			let rid: string;
 			if (visitor) {
 				const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {}, { userId: this.userId });
@@ -272,7 +272,7 @@ API.v1.addRoute(
 					guest.connectionData = normalizeHttpHeaderData(this.request.headers);
 				}
 
-				const visitor = await registerGuest(guest, { shouldConsiderIdleAgent: settings.get<boolean>('Livechat_enabled_when_agent_idle') });
+				visitor = await registerGuest(guest, { shouldConsiderIdleAgent: settings.get<boolean>('Livechat_enabled_when_agent_idle') });
 				if (!visitor) {
 					throw new Error('error-livechat-visitor-registration');
 				}

apps/meteor/app/livechat/server/hooks/leadCapture.ts

@@ -1,8 +1,8 @@
 import type { IMessage, IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { isEditedMessage } from '@rocket.chat/core-typings';
 import { LivechatVisitors } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { callbacks } from '../../../../server/lib/callbacks';
 import { settings } from '../../../settings/server';
 

apps/meteor/app/message-pin/server/pinMessage.ts

@@ -4,10 +4,10 @@ import { isQuoteAttachment, isRegisterUser } from '@rocket.chat/core-typings';
 import type { IMessage, MessageAttachment, MessageQuoteAttachment } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Rooms, Subscriptions, Users, ReadReceipts } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { isTruthy } from '../../../lib/isTruthy';
 import { canAccessRoomAsync, roomAccessAttributes } from '../../authorization/server';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { isTheLastMessage } from '../../lib/server/functions/isTheLastMessage';

apps/meteor/app/search/server/service/SearchResultValidationService.ts

@@ -1,9 +1,9 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Users, Rooms } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 import mem from 'mem';
 import { Meteor } from 'meteor/meteor';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { canAccessRoomAsync } from '../../../authorization/server';
 import { SearchLogger } from '../logger/logger';
 import type { IRawSearchResult, ISearchResult } from '../model/ISearchResult';

apps/meteor/app/slashcommands-inviteall/server/server.ts

@@ -6,9 +6,9 @@
 import { api } from '@rocket.chat/core-services';
 import type { ISubscription, SlashCommand, SlashCommandCallbackParams } from '@rocket.chat/core-typings';
 import { Rooms, Subscriptions, Users } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 import { Meteor } from 'meteor/meteor';
 
-import { isTruthy } from '../../../lib/isTruthy';
 import { i18n } from '../../../server/lib/i18n';
 import { canAccessRoomAsync } from '../../authorization/server';
 import { addUsersToRoomMethod } from '../../lib/server/methods/addUsersToRoom';

apps/meteor/client/components/PlanTag.tsx

@@ -1,8 +1,7 @@
 import { Box, Tag } from '@rocket.chat/fuselage';
+import { isTruthy } from '@rocket.chat/tools';
 import { useLicense } from '@rocket.chat/ui-client';
 
-import { isTruthy } from '../../lib/isTruthy';
-
 const developmentTag = process.env.NODE_ENV === 'development' ? 'Development' : null;
 function PlanTag() {
 	const license = useLicense();

apps/meteor/client/components/message/toolbar/MessageToolbarActionMenu.tsx

@@ -1,4 +1,5 @@
 import { isE2EEMessage, type IMessage, type IRoom, type ISubscription } from '@rocket.chat/core-typings';
+import { isTruthy } from '@rocket.chat/tools';
 import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
 import { useId } from 'react';
@@ -25,7 +26,6 @@ import { useUnstarMessageAction } from './useUnstarMessageAction';
 import { useViewOriginalTranslationAction } from './useViewOriginalTranslationAction';
 import { useWebDAVMessageAction } from './useWebDAVMessageAction';
 import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction';
-import { isTruthy } from '../../../../lib/isTruthy';
 
 type MessageActionSection = {
 	id: string;

apps/meteor/client/lib/cachedStores/CachedStore.ts

@@ -1,5 +1,6 @@
 import type { IRocketChatRecord } from '@rocket.chat/core-typings';
 import type { StreamNames } from '@rocket.chat/ddp-client';
+import { isTruthy } from '@rocket.chat/tools';
 import localforage from 'localforage';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
@@ -11,7 +12,6 @@ import { onLoggedIn } from '../loggedIn';
 import { CachedStoresManager } from './CachedStoresManager';
 import type { IDocumentMapStore } from './DocumentMapStore';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
-import { isTruthy } from '../../../lib/isTruthy';
 import { withDebouncing } from '../../../lib/utils/highOrderFunctions';
 import { getUserId } from '../user';
 import { getConfig } from '../utils/getConfig';

apps/meteor/client/lib/e2ee/rocketchat.e2e.ts

@@ -4,6 +4,7 @@ import URL from 'url';
 import type { IE2EEMessage, IMessage, IRoom, IUser, IUploadWithUser, Serialized, IE2EEPinnedMessage } from '@rocket.chat/core-typings';
 import { isE2EEMessage, isEncryptedMessageContent } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
+import { isTruthy } from '@rocket.chat/tools';
 import { imperativeModal } from '@rocket.chat/ui-client';
 import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 import _ from 'lodash';
@@ -21,7 +22,6 @@ import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { t } from '../../../app/utils/lib/i18n';
 import { createQuoteAttachment } from '../../../lib/createQuoteAttachment';
 import { getMessageUrlRegex } from '../../../lib/getMessageUrlRegex';
-import { isTruthy } from '../../../lib/isTruthy';
 import { Rooms, Subscriptions } from '../../stores';
 import EnterE2EPasswordModal from '../../views/e2e/EnterE2EPasswordModal';
 import SaveE2EPasswordModal from '../../views/e2e/SaveE2EPasswordModal';

apps/meteor/client/views/navigation/contexts/RoomsNavigationContext.ts

@@ -1,10 +1,10 @@
 import { type ISubscription, type ILivechatInquiryRecord, type IRoom, isTeamRoom, isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import { isTruthy } from '@rocket.chat/tools';
 import type { SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-contexts';
 import { createContext, useCallback, useContext, useEffect, useMemo } from 'react';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { useCollapsedGroups } from '../hooks/useCollapsedGroups';
 
 export const sidePanelFiltersConfig: { [Key in AllGroupsKeys]: { title: TranslationKey; icon: IconName } } = {

apps/meteor/client/views/room/body/JumpToRecentMessageButton.tsx

@@ -1,10 +1,9 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Bubble } from '@rocket.chat/fuselage';
+import { isTruthy } from '@rocket.chat/tools';
 import type { ReactElement } from 'react';
 import { useState } from 'react';
 
-import { isTruthy } from '../../../../lib/isTruthy';
-
 type JumpToRecentMessageButtonProps = {
 	visible: boolean;
 	onClick: () => void;

apps/meteor/client/views/room/body/RoomBody.tsx

@@ -1,10 +1,10 @@
 import { Box } from '@rocket.chat/fuselage';
+import { isTruthy } from '@rocket.chat/tools';
 import { CustomScrollbars, useEmbeddedLayout } from '@rocket.chat/ui-client';
 import { usePermission, useRole, useSetting, useTranslation, useUser, useUserPreference, useRoomToolbox } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import { memo, useCallback, useMemo } from 'react';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { useMergedRefsV2 } from '../../../hooks/useMergedRefsV2';
 import { BubbleDate } from '../BubbleDate';
 import { MessageList } from '../MessageList';

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx

@@ -1,5 +1,6 @@
 import type { IRoom, IMessage } from '@rocket.chat/core-typings';
 import type { Icon } from '@rocket.chat/fuselage';
+import { isTruthy } from '@rocket.chat/tools';
 import { GenericMenu, type GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { MessageComposerAction, MessageComposerActionsDivider } from '@rocket.chat/ui-composer';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
@@ -15,7 +16,6 @@ import { useTimestampAction } from './hooks/useTimestampAction';
 import { useVideoMessageAction } from './hooks/useVideoMessageAction';
 import { useWebdavActions } from './hooks/useWebdavActions';
 import { messageBox } from '../../../../../../app/ui-utils/client';
-import { isTruthy } from '../../../../../../lib/isTruthy';
 import { useMessageboxAppsActionButtons } from '../../../../../hooks/useMessageboxAppsActionButtons';
 import { useChat } from '../../../contexts/ChatContext';
 import { useRoom } from '../../../contexts/RoomContext';

apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx

@@ -2,6 +2,7 @@ import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
 import { MessageTypes } from '@rocket.chat/message-types';
+import { isTruthy } from '@rocket.chat/tools';
 import { CustomScrollbars } from '@rocket.chat/ui-client';
 import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import { differenceInSeconds } from 'date-fns';
@@ -10,7 +11,6 @@ import { Fragment } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { ThreadMessageItem } from './ThreadMessageItem';
-import { isTruthy } from '../../../../../../lib/isTruthy';
 import { BubbleDate } from '../../../BubbleDate';
 import { useJumpToMessageImperative } from '../../../MessageList/hooks/useJumpToMessage';
 import { isMessageNewDay } from '../../../MessageList/lib/isMessageNewDay';

apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts

@@ -1,6 +1,7 @@
 import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import type { AtLeast, ILivechatDepartment, ILivechatBusinessHour } from '@rocket.chat/core-typings';
 import { LivechatDepartment, LivechatDepartmentAgents, Users } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 import moment from 'moment';
 
 import { openBusinessHour, removeBusinessHourByAgentIds } from './Helper';
@@ -15,7 +16,6 @@ import {
 } from '../../../../../app/livechat/server/business-hour/Helper';
 import { closeBusinessHour } from '../../../../../app/livechat/server/business-hour/closeBusinessHour';
 import { settings } from '../../../../../app/settings/server';
-import { isTruthy } from '../../../../../lib/isTruthy';
 import { bhLogger } from '../lib/logger';
 
 interface IBusinessHoursExtraProperties extends ILivechatBusinessHour {

apps/meteor/ee/server/lib/audit/methods.ts

@@ -2,14 +2,14 @@ import type { ILivechatAgent, ILivechatVisitor, IMessage, IRoom, IUser, IAuditLo
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { LivechatRooms, Messages, Rooms, Users, AuditLog } from '@rocket.chat/models';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
+import { isTruthy } from '@rocket.chat/tools';
 import { check } from 'meteor/check';
 import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import { Meteor } from 'meteor/meteor';
 import type { Filter } from 'mongodb';
 
 import { hasPermissionAsync } from '../../../../app/authorization/server/functions/hasPermission';
 import { updateCounter } from '../../../../app/statistics/server';
-import { isTruthy } from '../../../../lib/isTruthy';
 import { callbacks } from '../../../../server/lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
 

apps/meteor/server/methods/browseChannels.ts

@@ -3,14 +3,14 @@ import type { IUser, AtLeast } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Rooms, Users, Subscriptions } from '@rocket.chat/models';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
+import { isTruthy } from '@rocket.chat/tools';
 import mem from 'mem';
 import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import { Meteor } from 'meteor/meteor';
 import type { FindOptions, SortDirection } from 'mongodb';
 
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { settings } from '../../app/settings/server';
-import { isTruthy } from '../../lib/isTruthy';
 import { trim } from '../../lib/utils/stringUtils';
 
 const sortChannels = (field: string, direction: 'asc' | 'desc'): Record<string, 1 | -1> => {

apps/meteor/server/startup/migrations/v317.ts

@@ -1,7 +1,7 @@
 import type { ILoginServiceConfiguration, OAuthConfiguration } from '@rocket.chat/core-typings';
 import { Settings, LoginServiceConfiguration } from '@rocket.chat/models';
+import { isTruthy } from '@rocket.chat/tools';
 
-import { isTruthy } from '../../../lib/isTruthy';
 import { SystemLogger } from '../../lib/logger/system';
 import { addMigration } from '../../lib/migrations';
 

apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts

@@ -1,3 +1,4 @@
+import { isTruthy } from '@rocket.chat/tools';
 import { expect } from 'chai';
 import proxyquire from 'proxyquire';
 
@@ -34,7 +35,6 @@ import { LogoutResponse } from '../../../../app/meteor-accounts-saml/server/lib/
 import { LogoutRequestParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutRequest';
 import { LogoutResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutResponse';
 import { ResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/Response';
-import { isTruthy } from '../../../../lib/isTruthy';
 
 const { ServiceProviderMetadata } = proxyquire
 	.noCallThru()

apps/meteor/tsconfig.json

@@ -22,32 +22,27 @@
 		"paths": {
 			/* Support absolute /imports/* with a leading '/' */
 			"/*": ["*"],
-			"meteor/*": ["./node_modules/@types/meteor/*", ".meteor/local/types/packages.d.ts"]
+			"meteor/*": ["./node_modules/@types/meteor/*", ".meteor/local/types/packages.d.ts"],
 		},
-		"preserveSymlinks": true
+		"preserveSymlinks": true,
 
 		// "sourceMap": true,
 		// "declaration": true,
 		// "removeComments": false,
 		// "emitDecoratorMetadata": true,
 		// "experimentalDecorators": true,
 	},
-	"include": [
-		"./**/*",
-		"./.storybook/**/*",
-		"./jest.config.ts",
-		"./.scripts/**/*"
-	],
+	"include": ["./**/*", "./.storybook/**/*", "./jest.config.ts", "./.scripts/**/*"],
 	"exclude": [
 		"**/node_modules/**",
 		"./.meteor/**",
 		"./imports/client/**",
 		"**/dist/**",
-		"./public/**"
+		"./public/**",
 		// "./ee/server/services/**"
 	],
 	"ts-node": {
 		"files": false,
-		"swc": true
-	}
+		"swc": true,
+	},
 }