Merge branch 'develop' into bump-webpack

Author: julio-rocketchat

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

@@ -3,6 +3,7 @@ import { Logger } from '@rocket.chat/logger';
 import { Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import type { JoinPathPattern, Method } from '@rocket.chat/rest-typings';
+import { wrapExceptions } from '@rocket.chat/tools';
 import express from 'express';
 import type { Request, Response } from 'express';
 import { Accounts } from 'meteor/accounts-base';
@@ -404,10 +405,14 @@ export class APIClass<TBasePath extends string = ''> {
 	public reloadRoutesToRefreshRateLimiter(): void {
 		this._routes.forEach((route) => {
 			if (this.shouldAddRateLimitToRoute(route.options)) {
-				this.addRateLimiterRuleForRoutes({
-					routes: [route.path],
-					rateLimiterOptions: route.options.rateLimiterOptions || defaultRateLimiterOptions,
-					endpoints: Object.keys(route.endpoints).filter((endpoint) => endpoint !== 'options'),
+				wrapExceptions(() =>
+					this.addRateLimiterRuleForRoutes({
+						routes: [route.path],
+						rateLimiterOptions: route.options.rateLimiterOptions || defaultRateLimiterOptions,
+						endpoints: Object.keys(route.endpoints).filter((endpoint) => endpoint !== 'options'),
+					}),
+				).catch((error) => {
+					console.error(error.message);
 				});
 			}
 		});
@@ -426,10 +431,10 @@ export class APIClass<TBasePath extends string = ''> {
 			throw new Meteor.Error('"rateLimiterOptions" must be an object');
 		}
 		if (!rateLimiterOptions.numRequestsAllowed) {
-			throw new Meteor.Error('You must set "numRequestsAllowed" property in rateLimiter for REST API endpoint');
+			throw new Meteor.Error(`You must set "numRequestsAllowed" property in rateLimiter for REST API endpoint: ${routes}`);
 		}
 		if (!rateLimiterOptions.intervalTimeInMS) {
-			throw new Meteor.Error('You must set "intervalTimeInMS" property in rateLimiter for REST API endpoint');
+			throw new Meteor.Error(`You must set "intervalTimeInMS" property in rateLimiter for REST API endpoint: ${routes}`);
 		}
 		const addRateLimitRuleToEveryRoute = (routes: string[]) => {
 			routes.forEach((route) => {

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

@@ -623,7 +623,7 @@ API.v1.addRoute(
 		authRequired: false,
 		rateLimiterOptions: {
 			numRequestsAllowed: settings.get('Rate_Limiter_Limit_RegisterUser') ?? 1,
-			intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default'),
+			intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default') ?? 600000,
 		},
 		validateParams: isUserRegisterParamsPOST,
 	},

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

@@ -1,4 +1,3 @@
-import './startup/settingsOnLoadSiteUrl';
 import '../lib/MessageTypes';
 import './OAuthProxy';
 import './methods/sendMessage';

apps/meteor/app/lib/client/startup/settingsOnLoadSiteUrl.ts

@@ -21,7 +21,6 @@ export const useRoomToolboxActions = ({ actions, openTab }: Pick<RoomToolboxCont
 	const hiddenActions = (!roomToolboxExpanded ? actions : [...appsActions, ...normalActions.slice(6)])
 		.filter((item) => !item.disabled && !item.featured)
 		.map((item) => ({
-			'key': item.id,
 			'content': t(item.title),
 			'onClick':
 				item.action ??
@@ -39,7 +38,7 @@ export const useRoomToolboxActions = ({ actions, openTab }: Pick<RoomToolboxCont
 				return acc;
 			}
 
-			const newSection = { id: group, key: item.key, title: group === 'apps' ? t('Apps') : '', items: [item] };
+			const newSection = { id: group, title: group === 'apps' ? t('Apps') : '', items: [item] };
 			acc.push(newSection);
 
 			return acc;

apps/meteor/client/views/room/Header/RoomToolbox/hooks/useRoomToolboxActions.ts

@@ -21,7 +21,6 @@ export const useRoomToolboxActions = ({ actions, openTab }: Pick<RoomToolboxCont
 	const hiddenActions = (!roomToolboxExpanded ? actions : [...appsActions, ...normalActions.slice(6)])
 		.filter((item) => !item.disabled && !item.featured)
 		.map((item) => ({
-			'key': item.id,
 			'content': t(item.title),
 			'onClick':
 				item.action ??
@@ -39,7 +38,7 @@ export const useRoomToolboxActions = ({ actions, openTab }: Pick<RoomToolboxCont
 				return acc;
 			}
 
-			const newSection = { id: group, key: item.key, title: group === 'apps' ? t('Apps') : '', items: [item] };
+			const newSection = { id: group, title: group === 'apps' ? t('Apps') : '', items: [item] };
 			acc.push(newSection);
 
 			return acc;

apps/meteor/client/views/room/HeaderV2/RoomToolbox/hooks/useRoomToolboxActions.ts

@@ -1,5 +1,5 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { render, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 
 import VideoConfPopups from './VideoConfPopups';
 import { createFakeRoom } from '../../../../../../tests/mocks/data';
@@ -18,5 +18,6 @@ test('should render video conference incoming popup', async () => {
 			.build(),
 	});
 
-	expect(await screen.findByRole('dialog')).toBeInTheDocument();
+	await waitFor(() => screen.findByRole('dialog'));
+	expect(screen.getByRole('dialog')).toBeInTheDocument();
 });

apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.spec.tsx

@@ -5,6 +5,7 @@ import PageLoading from './PageLoading';
 import { useEscapeKeyStroke } from './hooks/useEscapeKeyStroke';
 import { useGoogleTagManager } from './hooks/useGoogleTagManager';
 import { useMessageLinkClicks } from './hooks/useMessageLinkClicks';
+import { useSettingsOnLoadSiteUrl } from './hooks/useSettingsOnLoadSiteUrl';
 import { useAnalytics } from '../../../app/analytics/client/loadScript';
 import { useLivechatEnterprise } from '../../../app/livechat-enterprise/hooks/useLivechatEnterprise';
 import { useNextcloud } from '../../../app/nextcloud/client/useNextcloud';
@@ -29,7 +30,7 @@ const AppLayout = () => {
 	useAnalyticsEventTracking();
 	useLoadRoomForAllowedAnonymousRead();
 	useNotifyUser();
-
+	useSettingsOnLoadSiteUrl();
 	useLivechatEnterprise();
 	useNextcloud();
 

apps/meteor/client/views/root/AppLayout.tsx

@@ -0,0 +1,14 @@
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useEffect } from 'react';
+
+export const useSettingsOnLoadSiteUrl = () => {
+	const siteUrl = useSetting('Site_Url') as string;
+
+	useEffect(() => {
+		const value = siteUrl;
+		if (value == null || value.trim() === '') {
+			return;
+		}
+		(window as any).__meteor_runtime_config__.ROOT_URL = value;
+	}, [siteUrl]);
+};