Merge branch 'develop' into voip/wrap-up

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

@@ -9,7 +9,6 @@ export const getUploadFormData = async ({ request }) =>
 		bb.on('file', (fieldname, file, { filename, encoding, mimeType: mimetype }) => {
 			const fileData = [];
 
-			console.log(file);
 			file.on('data', (data) => fileData.push(data));
 
 			file.on('end', () => {

apps/meteor/app/api/server/v1/emoji-custom.js → apps/meteor/app/api/server/v1/emoji-custom.ts

@@ -10,27 +10,29 @@ API.v1.addRoute(
 	'emoji-custom.list',
 	{ authRequired: true },
 	{
-		get() {
+		async get() {
 			const { query } = this.parseJsonQuery();
 			const { updatedSince } = this.queryParams;
-			let updatedSinceDate;
 			if (updatedSince) {
+				const updatedSinceDate = new Date(updatedSince);
 				if (isNaN(Date.parse(updatedSince))) {
 					throw new Meteor.Error('error-roomId-param-invalid', 'The "updatedSince" query parameter must be a valid date.');
-				} else {
-					updatedSinceDate = new Date(updatedSince);
 				}
+				const [update, remove] = await Promise.all([
+					EmojiCustom.find({ ...query, _updatedAt: { $gt: updatedSinceDate } }).toArray(),
+					EmojiCustom.trashFindDeletedAfter(updatedSinceDate).toArray(),
+				]);
 				return API.v1.success({
 					emojis: {
-						update: Promise.await(EmojiCustom.find({ ...query, _updatedAt: { $gt: updatedSinceDate } }).toArray()),
-						remove: Promise.await(EmojiCustom.trashFindDeletedAfter(updatedSinceDate).toArray()),
+						update,
+						remove,
 					},
 				});
 			}
 
 			return API.v1.success({
 				emojis: {
-					update: Promise.await(EmojiCustom.find(query).toArray()),
+					update: await EmojiCustom.find(query).toArray(),
 					remove: [],
 				},
 			});
@@ -42,21 +44,19 @@ API.v1.addRoute(
 	'emoji-custom.all',
 	{ authRequired: true },
 	{
-		get() {
+		async get() {
 			const { offset, count } = this.getPaginationItems();
 			const { sort, query } = this.parseJsonQuery();
 
 			return API.v1.success(
-				Promise.await(
-					findEmojisCustom({
-						query,
-						pagination: {
-							offset,
-							count,
-							sort,
-						},
-					}),
-				),
+				await findEmojisCustom({
+					query,
+					pagination: {
+						offset,
+						count,
+						sort,
+					},
+				}),
 			);
 		},
 	},
@@ -66,18 +66,16 @@ API.v1.addRoute(
 	'emoji-custom.create',
 	{ authRequired: true },
 	{
-		post() {
-			const { emoji, ...fields } = Promise.await(
-				getUploadFormData({
-					request: this.request,
-				}),
-			);
+		async post() {
+			const { emoji, ...fields } = await getUploadFormData({
+				request: this.request,
+			});
 
 			if (!emoji) {
 				throw new Meteor.Error('invalid-field');
 			}
 
-			const isUploadable = Promise.await(Media.isImage(emoji.fileBuffer));
+			const isUploadable = await Media.isImage(emoji.fileBuffer);
 			if (!isUploadable) {
 				throw new Meteor.Error('emoji-is-not-image', "Emoji file provided cannot be uploaded since it's not an image");
 			}
@@ -88,10 +86,10 @@ API.v1.addRoute(
 			fields.newFile = true;
 			fields.aliases = fields.aliases || '';
 
-			Meteor.runAsUser(this.userId, () => {
-				Meteor.call('insertOrUpdateEmoji', fields);
-				Meteor.call('uploadEmojiCustom', emoji.fileBuffer, emoji.mimetype, fields);
-			});
+			Meteor.call('insertOrUpdateEmoji', fields);
+			Meteor.call('uploadEmojiCustom', emoji.fileBuffer, emoji.mimetype, fields);
+
+			return API.v1.success();
 		},
 	},
 );
@@ -100,12 +98,10 @@ API.v1.addRoute(
 	'emoji-custom.update',
 	{ authRequired: true },
 	{
-		post() {
-			const { emoji, ...fields } = Promise.await(
-				getUploadFormData({
-					request: this.request,
-				}),
-			);
+		async post() {
+			const { emoji, ...fields } = await getUploadFormData({
+				request: this.request,
+			});
 
 			if (!fields._id) {
 				throw new Meteor.Error('The required "_id" query param is missing.');
@@ -133,12 +129,11 @@ API.v1.addRoute(
 				fields.extension = emojiToUpdate.extension;
 			}
 
-			Meteor.runAsUser(this.userId, () => {
-				Meteor.call('insertOrUpdateEmoji', fields);
-				if (fields.newFile) {
-					Meteor.call('uploadEmojiCustom', emoji.fileBuffer, emoji.mimetype, fields);
-				}
-			});
+			Meteor.call('insertOrUpdateEmoji', fields);
+			if (fields.newFile) {
+				Meteor.call('uploadEmojiCustom', emoji.fileBuffer, emoji.mimetype, fields);
+			}
+			return API.v1.success();
 		},
 	},
 );
@@ -153,7 +148,7 @@ API.v1.addRoute(
 				return API.v1.failure('The "emojiId" params is required!');
 			}
 
-			Meteor.runAsUser(this.userId, () => Meteor.call('deleteEmojiCustom', emojiId));
+			Meteor.call('deleteEmojiCustom', emojiId);
 
 			return API.v1.success();
 		},

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

@@ -14,6 +14,7 @@ import {
 	isMethodCallAnonProps,
 	isMeteorCall,
 } from '@rocket.chat/rest-typings';
+import { IUser } from '@rocket.chat/core-typings';
 
 import { hasPermission } from '../../../authorization/server';
 import { Users } from '../../../models/server';
@@ -166,17 +167,24 @@ API.v1.addRoute(
 	'me',
 	{ authRequired: true },
 	{
-		get() {
+		async get() {
 			const fields = getDefaultUserFields();
-			const user = Users.findOneById(this.userId, { fields });
-
-			// The password hash shouldn't be leaked but the client may need to know if it exists.
-			if (user?.services?.password?.bcrypt) {
-				user.services.password.exists = true;
-				delete user.services.password.bcrypt;
-			}
-
-			return API.v1.success(this.getUserInfo(user));
+			const { services, ...user } = Users.findOneById(this.userId, { fields }) as IUser;
+
+			return API.v1.success(
+				this.getUserInfo({
+					...user,
+					...(services && {
+						services: {
+							...services,
+							password: {
+								// The password hash shouldn't be leaked but the client may need to know if it exists.
+								exists: Boolean(services?.password?.bcrypt),
+							} as any,
+						},
+					}),
+				}),
+			);
 		},
 	},
 );

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

@@ -154,7 +154,7 @@ API.v1.addRoute(
 		},
 		post: {
 			twoFactorRequired: true,
-			async action(): Promise<ResultFor<'POST', 'settings/:_id'>> {
+			async action(): Promise<ResultFor<'POST', '/v1/settings/:_id'>> {
 				if (!hasPermission(this.userId, 'edit-privileged-setting')) {
 					return API.v1.unauthorized();
 				}

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

@@ -83,7 +83,11 @@ const parseAndValidate = (property: string, date?: string): DateParam => {
 
 API.v1.addRoute(
 	'voip/room',
-	{ authRequired: false, rateLimiterOptions: { numRequestsAllowed: 5, intervalTimeInMS: 60000 } },
+	{
+		authRequired: true,
+		rateLimiterOptions: { numRequestsAllowed: 5, intervalTimeInMS: 60000 },
+		permissionsRequired: ['inbound-voip-calls'],
+	},
 	{
 		async get() {
 			const defaultCheckParams = {
@@ -213,7 +217,7 @@ API.v1.addRoute(
  */
 API.v1.addRoute(
 	'voip/room.close',
-	{ authRequired: true, validateParams: isVoipRoomCloseProps },
+	{ authRequired: true, validateParams: isVoipRoomCloseProps, permissionsRequired: ['inbound-voip-calls'] },
 	{
 		async post() {
 			const { rid, token, options } = this.bodyParams;

apps/meteor/app/apps/client/@types/IOrchestrator.ts

@@ -1,4 +1,3 @@
-import { IAppInfo } from '@rocket.chat/apps-engine/definition/metadata/IAppInfo';
 import { ISetting } from '@rocket.chat/apps-engine/definition/settings/ISetting';
 
 export interface IDetailedDescription {
@@ -148,7 +147,6 @@ export interface IAppLanguage {
 
 export interface IAppExternalURL {
 	url: string;
-	success: boolean;
 }
 
 export interface ICategory {
@@ -159,10 +157,10 @@ export interface ICategory {
 	title: string;
 }
 
-export interface IDeletedInstalledApp {
-	app: IAppInfo;
-	success: boolean;
-}
+// export interface IDeletedInstalledApp {
+// 	app: IAppInfo;
+// 	success: boolean;
+// }
 
 export interface IAppSynced {
 	app: IAppFromMarketplace;
@@ -193,12 +191,3 @@ export interface ISettingsReturn {
 	settings: ISettings;
 	success: boolean;
 }
-
-export interface ISettingsPayload {
-	settings: ISetting[];
-}
-
-export interface ISettingsSetReturn {
-	updated: ISettings;
-	success: boolean;
-}

apps/meteor/app/apps/client/RealAppsEngineUIHost.js

@@ -29,7 +29,7 @@ export class RealAppsEngineUIHost extends AppsEngineUIHost {
 
 		let cachedMembers = [];
 		try {
-			const { members } = await APIClient.get('v1/groups.members', { roomId: id });
+			const { members } = await APIClient.get('/v1/groups.members', { roomId: id });
 
 			cachedMembers = members.map(({ _id, username }) => ({
 				id: _id,

apps/meteor/app/apps/client/communication/websockets.js

@@ -50,7 +50,7 @@ export class AppWebsocketReceiver extends Emitter {
 	}
 
 	onCommandAddedOrUpdated = (command) => {
-		APIClient.v1.get('commands.get', { command }).then((result) => {
+		APIClient.get('/v1/commands.get', { command }).then((result) => {
 			slashCommands.commands[command] = result.command;
 		});
 	};

apps/meteor/app/apps/client/gameCenter/gameCenter.js

@@ -8,7 +8,7 @@ import { handleError } from '../../../../client/lib/utils/handleError';
 
 const getExternalComponents = async (instance) => {
 	try {
-		const { externalComponents } = await APIClient.get('apps/externalComponents');
+		const { externalComponents } = await APIClient.get('/apps/externalComponents');
 		instance.games.set(externalComponents);
 	} catch (e) {
 		handleError(e);

apps/meteor/app/apps/client/gameCenter/gameContainer.js

@@ -62,7 +62,7 @@ Template.GameContainer.events({
 Template.GameContainer.onCreated(async () => {
 	const externalComponent = await getExternalComponent();
 
-	APIClient.post('apps/externalComponentEvent', {
+	APIClient.post('/apps/externalComponentEvent', {
 		event: 'IPostExternalComponentOpened',
 		externalComponent,
 	});
@@ -71,7 +71,7 @@ Template.GameContainer.onCreated(async () => {
 Template.GameContainer.onDestroyed(async () => {
 	const externalComponent = await getExternalComponent();
 
-	APIClient.post('apps/externalComponentEvent', {
+	APIClient.post('/apps/externalComponentEvent', {
 		event: 'IPostExternalComponentClosed',
 		externalComponent,
 	});