Merge branch 'develop' into new/device-management

apps/meteor/.mocharc.api.js

@@ -9,5 +9,10 @@ module.exports = {
 	timeout: 10000,
 	bail: true,
 	file: 'tests/end-to-end/teardown.js',
-	spec: ['tests/unit/app/api/server/v1/*.spec.ts', 'tests/end-to-end/api/*.js', 'tests/end-to-end/api/*.ts', 'tests/end-to-end/apps/*.js'],
+	spec: [
+		'tests/unit/app/api/server/v1/**/*.spec.ts',
+		'tests/end-to-end/api/*.js',
+		'tests/end-to-end/api/*.ts',
+		'tests/end-to-end/apps/*.js',
+	],
 };

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

@@ -9,6 +9,7 @@ import type {
 } from '@rocket.chat/rest-typings';
 import type { IUser, IMethodConnection, IRoom } from '@rocket.chat/core-typings';
 import type { ValidateFunction } from 'ajv';
+import type { Request } from 'express';
 
 import { ITwoFactorOptions } from '../../2fa/server/code';
 
@@ -70,13 +71,6 @@ type Options = (
 	validateParams?: ValidateFunction;
 };
 
-type Request = {
-	method: 'GET' | 'POST' | 'PUT' | 'DELETE';
-	url: string;
-	headers: Record<string, string>;
-	body: any;
-};
-
 type PartialThis = {
 	readonly request: Request & { query: Record<string, string> };
 };

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

@@ -70,7 +70,7 @@ API.helperMethods.set(
 		if (typeof fields === 'object') {
 			let nonSelectableFields = Object.keys(API.v1.defaultFieldsToExclude);
 			if (this.request.route.includes('/v1/users.')) {
-				const getFields = () =>
+				const getFields = (): string[] =>
 					Object.keys(
 						hasPermission(this.userId, 'view-full-other-user-info')
 							? API.v1.limitedUserFieldsToExcludeIfIsPrivilegedUser

apps/meteor/app/api/server/lib/emoji-custom.ts

@@ -0,0 +1,34 @@
+import { IEmojiCustom, ILivechatDepartmentRecord } from '@rocket.chat/core-typings';
+import { FilterQuery, SortOptionObject } from 'mongodb';
+
+import { EmojiCustom } from '../../../models/server/raw';
+
+export async function findEmojisCustom({
+	query = {},
+	pagination: { offset, count, sort },
+}: {
+	query: FilterQuery<ILivechatDepartmentRecord>;
+	pagination: { offset: number; count: number; sort: SortOptionObject<IEmojiCustom> };
+}): Promise<{
+	emojis: IEmojiCustom[];
+	count: number;
+	offset: any;
+	total: number;
+}> {
+	const cursor = EmojiCustom.find(query, {
+		sort: sort || { name: 1 },
+		skip: offset,
+		limit: count,
+	});
+
+	const total = await cursor.count();
+
+	const emojis = await cursor.toArray();
+
+	return {
+		emojis,
+		count: emojis.length,
+		offset,
+		total,
+	};
+}

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

@@ -0,0 +1,90 @@
+import { Readable } from 'stream';
+
+import { Meteor } from 'meteor/meteor';
+import type { Request } from 'express';
+import busboy from 'busboy';
+import { ValidateFunction } from 'ajv';
+
+type UploadResult = {
+	file: Readable;
+	filename: string;
+	encoding: string;
+	mimetype: string;
+	fileBuffer: Buffer;
+};
+
+export const getUploadFormData = async <T extends string, K, V extends ValidateFunction<K>>(
+	{ request }: { request: Request },
+	options: {
+		field?: T;
+		validate?: V;
+	} = {},
+): Promise<
+	[
+		UploadResult,
+		K extends unknown
+			? {
+					[k: string]: string;
+			  }
+			: K,
+		T,
+	]
+> =>
+	new Promise((resolve, reject) => {
+		const bb = busboy({ headers: request.headers, defParamCharset: 'utf8' });
+		const fields: { [K: string]: string } = Object.create(null);
+
+		let uploadedFile: UploadResult | undefined;
+
+		let assetName: T | undefined;
+
+		bb.on(
+			'file',
+			(
+				fieldname: string,
+				file: Readable,
+				{ filename, encoding, mimeType: mimetype }: { filename: string; encoding: string; mimeType: string },
+			) => {
+				const fileData: Uint8Array[] = [];
+
+				file.on('data', (data: any) => fileData.push(data));
+
+				file.on('end', () => {
+					if (uploadedFile) {
+						return reject('Just 1 file is allowed');
+					}
+					if (options.field && fieldname !== options.field) {
+						return reject(new Meteor.Error('invalid-field'));
+					}
+					uploadedFile = {
+						file,
+						filename,
+						encoding,
+						mimetype,
+						fileBuffer: Buffer.concat(fileData),
+					};
+
+					assetName = fieldname as T;
+				});
+			},
+		);
+
+		bb.on('field', (fieldname, value) => {
+			fields[fieldname] = value;
+		});
+
+		bb.on('finish', () => {
+			if (!uploadedFile || !assetName) {
+				return reject('No file uploaded');
+			}
+			if (options.validate === undefined) {
+				return resolve([uploadedFile, fields, assetName]);
+			}
+			if (!options.validate(fields)) {
+				return reject(`Invalid fields${options.validate.errors?.join(', ')}`);
+			}
+			return resolve([uploadedFile, fields, assetName]);
+		});
+
+		request.pipe(bb);
+	});

apps/meteor/app/api/server/lib/messages.js → apps/meteor/app/api/server/lib/messages.ts

@@ -1,13 +1,28 @@
+import { IMessage, IUser } from '@rocket.chat/core-typings';
+
 import { canAccessRoomAsync } from '../../../authorization/server/functions/canAccessRoom';
 import { Rooms, Messages, Users } from '../../../models/server/raw';
 import { getValue } from '../../../settings/server/raw';
 
-export async function findMentionedMessages({ uid, roomId, pagination: { offset, count, sort } }) {
+export async function findMentionedMessages({
+	uid,
+	roomId,
+	pagination: { offset, count, sort },
+}: {
+	uid: string;
+	roomId: string;
+	pagination: { offset: number; count: number; sort: [string, number][] };
+}): Promise<{
+	messages: IMessage[];
+	count: number;
+	offset: number;
+	total: number;
+}> {
 	const room = await Rooms.findOneById(roomId);
 	if (!(await canAccessRoomAsync(room, { _id: uid }))) {
 		throw new Error('error-not-allowed');
 	}
-	const user = await Users.findOneById(uid, { fields: { username: 1 } });
+	const user: IUser | null = await Users.findOneById(uid, { fields: { username: 1 } });
 	if (!user) {
 		throw new Error('invalid-user');
 	}
@@ -30,7 +45,20 @@ export async function findMentionedMessages({ uid, roomId, pagination: { offset,
 	};
 }
 
-export async function findStarredMessages({ uid, roomId, pagination: { offset, count, sort } }) {
+export async function findStarredMessages({
+	uid,
+	roomId,
+	pagination: { offset, count, sort },
+}: {
+	uid: string;
+	roomId: string;
+	pagination: { offset: number; count: number; sort: [string, number][] };
+}): Promise<{
+	messages: IMessage[];
+	count: number;
+	offset: any;
+	total: number;
+}> {
 	const room = await Rooms.findOneById(roomId);
 	if (!(await canAccessRoomAsync(room, { _id: uid }))) {
 		throw new Error('error-not-allowed');
@@ -58,7 +86,7 @@ export async function findStarredMessages({ uid, roomId, pagination: { offset, c
 	};
 }
 
-export async function findSnippetedMessageById({ uid, messageId }) {
+export async function findSnippetedMessageById({ uid, messageId }: { uid: string; messageId: string }): Promise<IMessage> {
 	if (!(await getValue('Message_AllowSnippeting'))) {
 		throw new Error('error-not-allowed');
 	}
@@ -83,12 +111,23 @@ export async function findSnippetedMessageById({ uid, messageId }) {
 		throw new Error('error-not-allowed');
 	}
 
-	return {
-		message: snippet,
-	};
+	return snippet;
 }
 
-export async function findSnippetedMessages({ uid, roomId, pagination: { offset, count, sort } }) {
+export async function findSnippetedMessages({
+	uid,
+	roomId,
+	pagination: { offset, count, sort },
+}: {
+	uid: string;
+	roomId: string;
+	pagination: { offset: number; count: number; sort: [string, number][] };
+}): Promise<{
+	messages: IMessage[];
+	count: number;
+	offset: number;
+	total: number;
+}> {
 	if (!(await getValue('Message_AllowSnippeting'))) {
 		throw new Error('error-not-allowed');
 	}
@@ -116,7 +155,22 @@ export async function findSnippetedMessages({ uid, roomId, pagination: { offset,
 	};
 }
 
-export async function findDiscussionsFromRoom({ uid, roomId, text, pagination: { offset, count, sort } }) {
+export async function findDiscussionsFromRoom({
+	uid,
+	roomId,
+	text,
+	pagination: { offset, count, sort },
+}: {
+	uid: string;
+	roomId: string;
+	text: string;
+	pagination: { offset: number; count: number; sort: [string, number][] };
+}): Promise<{
+	messages: IMessage[];
+	count: number;
+	offset: number;
+	total: number;
+}> {
 	const room = await Rooms.findOneById(roomId);
 
 	if (!(await canAccessRoomAsync(room, { _id: uid }))) {