Merge branch 'develop' into feat/implement-adr-0061

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

@@ -60,6 +60,7 @@ export async function parseJsonQuery(api: PartialThis): Promise<{
 		'/api/v1/integrations.list',
 		'/api/v1/custom-user-status.list',
 		'/api/v1/custom-sounds.list',
+		'/api/v1/channels.list',
 	].includes(route);
 
 	const isUnsafeQueryParamsAllowed = process.env.ALLOW_UNSAFE_QUERY_AND_FIELDS_API_PARAMS?.toUpperCase() === 'TRUE';

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

@@ -18,6 +18,7 @@ import {
 	isChannelsConvertToTeamProps,
 	isChannelsSetReadOnlyProps,
 	isChannelsDeleteProps,
+	isChannelsListProps,
 	isChannelsFilesListProps,
 } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
@@ -929,14 +930,21 @@ API.v1.addRoute(
 		permissionsRequired: {
 			GET: { permissions: ['view-c-room', 'view-joined-room'], operation: 'hasAny' },
 		},
+		validateParams: isChannelsListProps,
 	},
 	{
 		async get() {
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { sort, fields, query } = await this.parseJsonQuery();
 			const hasPermissionToSeeAllPublicChannels = await hasPermissionAsync(this.userId, 'view-c-room');
 
-			const ourQuery: Record<string, any> = { ...query, t: 'c' };
+			const { _id } = this.queryParams;
+
+			const ourQuery = {
+				...query,
+				...(_id ? { _id } : {}),
+				t: 'c',
+			};
 
 			if (!hasPermissionToSeeAllPublicChannels) {
 				const roomIds = (

apps/meteor/app/e2e/server/functions/resetRoomKey.ts

@@ -88,7 +88,7 @@ export async function resetRoomKey(roomId: string, userId: string, newRoomKey: s
 	}
 }
 
-function pushToLimit(
+export function pushToLimit(
 	arr: NonNullable<IRoom['usersWaitingForE2EKeys']>,
 	item: NonNullable<IRoom['usersWaitingForE2EKeys']>[number],
 	limit = 50,
@@ -99,15 +99,15 @@ function pushToLimit(
 }
 
 async function writeAndNotify(updateOps: AnyBulkWriteOperation<ISubscription>[], notifySubs: ISubscription[]) {
-	await Subscriptions.col.bulkWrite(updateOps);
+	await Subscriptions.col.bulkWrite([...updateOps]);
 	notifySubs.forEach((sub) => {
 		void notifyOnSubscriptionChanged(sub);
 	});
 	notifySubs.length = 0;
 	updateOps.length = 0;
 }
 
-function replicateMongoSlice(keyId: string, sub: ISubscription) {
+export function replicateMongoSlice(keyId: string, sub: ISubscription) {
 	if (!sub.E2EKey) {
 		return;
 	}

apps/meteor/client/providers/AppsProvider/AppsProvider.tsx

@@ -2,7 +2,7 @@ import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import { usePermission, useStream } from '@rocket.chat/ui-contexts';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 
 import { AppClientOrchestratorInstance } from '../../apps/orchestrator';
 import { AppsContext } from '../../contexts/AppsContext';
@@ -47,8 +47,6 @@ const AppsProvider = ({ children }: AppsProviderProps) => {
 	const { isLoading: isLicenseInformationLoading, data: { license, limits } = {} } = useLicense({ loadValues: true });
 	const isEnterprise = isLicenseInformationLoading ? undefined : !!license;
 
-	const [marketplaceError, setMarketplaceError] = useState<Error>();
-
 	const invalidateAppsCountQuery = useInvalidateAppsCountQueryCallback();
 	const invalidateLicenseQuery = useInvalidateLicense();
 
@@ -80,8 +78,7 @@ const AppsProvider = ({ children }: AppsProviderProps) => {
 			const result = await AppClientOrchestratorInstance.getAppsFromMarketplace(isAdminUser);
 			queryClient.invalidateQueries(['marketplace', 'apps-stored']);
 			if (result.error && typeof result.error === 'string') {
-				setMarketplaceError(new Error(result.error));
-				return [];
+				throw new Error(result.error);
 			}
 			return result.apps;
 		},
@@ -125,7 +122,11 @@ const AppsProvider = ({ children }: AppsProviderProps) => {
 			children={children}
 			value={{
 				installedApps: getAppState(isMarketplaceDataLoading, installedAppsData),
-				marketplaceApps: getAppState(isMarketplaceDataLoading, marketplaceAppsData, marketplaceError),
+				marketplaceApps: getAppState(
+					isMarketplaceDataLoading,
+					marketplaceAppsData,
+					marketplace.error instanceof Error ? marketplace.error : undefined,
+				),
 				privateApps: getAppState(isMarketplaceDataLoading, privateAppsData),
 
 				reload: async () => {

apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx

@@ -45,7 +45,7 @@ const MarketplaceHeader = ({ title, unsupportedVersion }: { title: string; unsup
 		<PageHeader title={title}>
 			{result.isLoading && <GenericResourceUsageSkeleton mi={16} />}
 
-			{result.isSuccess && !result.data.hasUnlimitedApps && (
+			{!unsupportedVersion && result.isSuccess && !result.data.hasUnlimitedApps && (
 				<Margins inline={16}>
 					<EnabledAppsCount
 						{...result.data}
@@ -56,10 +56,6 @@ const MarketplaceHeader = ({ title, unsupportedVersion }: { title: string; unsup
 			)}
 
 			<ButtonGroup wrap align='end'>
-				{!unsupportedVersion && result.isSuccess && !result.data.hasUnlimitedApps && (
-					<EnabledAppsCount {...result.data} context={context} />
-				)}
-
 				{!unsupportedVersion && isAdmin && result.isSuccess && !result.data.hasUnlimitedApps && context !== 'private' && (
 					<Button
 						onClick={() => {
@@ -71,7 +67,7 @@ const MarketplaceHeader = ({ title, unsupportedVersion }: { title: string; unsup
 				)}
 
 				{isAdmin && context === 'private' && <Button onClick={handleClickPrivate}>{t('Upload_private_app')}</Button>}
-				{isAdmin && result.isSuccess && !privateAppsEnabled && context === 'private' && <UpdateRocketChatButton />}
+				{unsupportedVersion && isAdmin && context !== 'private' && <UpdateRocketChatButton />}
 			</ButtonGroup>
 		</PageHeader>
 	);

apps/meteor/ee/server/apps/orchestrator.js

@@ -186,7 +186,7 @@ export class AppServerOrchestrator {
 				continue;
 			}
 
-			await this.getManager().loadOne(app.getID());
+			await this.getManager().loadOne(app.getID(), true);
 		}
 		/* eslint-enable no-await-in-loop */
 

apps/meteor/ee/server/apps/storage/AppRealStorage.ts

@@ -46,7 +46,7 @@ export class AppRealStorage extends AppMetadataStorage {
 	}
 
 	public async update(item: IAppStorageItem): Promise<IAppStorageItem> {
-		await this.db.updateOne({ id: item.id }, { $set: item });
+		await this.db.updateOne({ id: item.id, _id: item._id }, { $set: item });
 		return this.retrieveOne(item.id);
 	}
 

apps/meteor/tests/end-to-end/api/channels.ts

@@ -373,9 +373,7 @@ describe('[Channels]', () => {
 				.get(api('channels.list'))
 				.set(credentials)
 				.query({
-					query: JSON.stringify({
-						_id: testChannel._id,
-					}),
+					_id: testChannel._id,
 				})
 				.expect('Content-Type', 'application/json')
 				.expect(200)

apps/meteor/tests/mocks/data/subscriptions.ts

@@ -0,0 +1,40 @@
+import { faker } from '@faker-js/faker';
+
+export function mockSubscription() {
+	const data: Record<string, any> = {
+		_id: faker.string.uuid(),
+		rid: faker.string.uuid(),
+		name: faker.person.firstName(),
+		t: 'd',
+		alert: true,
+		E2EKey: faker.datatype.boolean() ? faker.string.uuid() : undefined,
+		E2ESuggestedKey: faker.datatype.boolean() ? faker.string.uuid() : undefined,
+		oldRoomKeys: faker.datatype.boolean() ? generateOldKeys() : undefined,
+		u: {
+			_id: faker.person.firstName(),
+		},
+	};
+
+	return data;
+}
+
+function generateOldKeys() {
+	const amount = faker.number.int({ min: 1, max: 10 });
+	const oldRoomKeys = [];
+	for (let i = 0; i < amount; i++) {
+		oldRoomKeys.push({
+			E2EKey: faker.string.uuid(),
+			ts: new Date(),
+			e2eKeyId: faker.string.uuid().slice(12),
+		});
+	}
+	return oldRoomKeys;
+}
+
+export function generateMultipleSubs(amount: number) {
+	const subs = [];
+	for (let i = 0; i < amount; i++) {
+		subs.push(mockSubscription());
+	}
+	return subs;
+}