Chore: RestApiClient as Package

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/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/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,
 	});

apps/meteor/app/apps/client/orchestrator.js

@@ -6,7 +6,7 @@ import { dispatchToastMessage } from '../../../client/lib/toast';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { settings } from '../../settings/client';
 import { CachedCollectionManager } from '../../ui-cached-collection';
-import { APIClient } from '../../utils';
+import { APIClient } from '../../utils/client';
 import { AppWebsocketReceiver } from './communication';
 import { handleI18nResources } from './i18n';
 import { RealAppsEngineUIHost } from './RealAppsEngineUIHost';
@@ -63,12 +63,12 @@ class AppClientOrchestrator {
 	isEnabled = () => this.deferredIsEnabled;
 
 	getApps = async () => {
-		const { apps } = await APIClient.get('apps');
+		const { apps } = await APIClient.get('/apps');
 		return apps;
 	};
 
 	getAppsFromMarketplace = async () => {
-		const appsOverviews = await APIClient.get('apps', { marketplace: 'true' });
+		const appsOverviews = await APIClient.get('/apps', { marketplace: 'true' });
 		return appsOverviews.map(({ latest, price, pricingPlans, purchaseType, isEnterpriseOnly, modifiedAt }) => ({
 			...latest,
 			price,
@@ -80,30 +80,30 @@ class AppClientOrchestrator {
 	};
 
 	getAppsOnBundle = async (bundleId) => {
-		const { apps } = await APIClient.get(`apps/bundles/${bundleId}/apps`);
+		const { apps } = await APIClient.get(`/apps/bundles/${bundleId}/apps`);
 		return apps;
 	};
 
 	getAppsLanguages = async () => {
-		const { apps } = await APIClient.get('apps/languages');
+		const { apps } = await APIClient.get('/apps/languages');
 		return apps;
 	};
 
 	getApp = async (appId) => {
-		const { app } = await APIClient.get(`apps/${appId}`);
+		const { app } = await APIClient.get(`/apps/${appId}`);
 		return app;
 	};
 
 	getAppFromMarketplace = async (appId, version) => {
-		const { app } = await APIClient.get(`apps/${appId}`, {
+		const { app } = await APIClient.get(`/apps/${appId}`, {
 			marketplace: 'true',
 			version,
 		});
 		return app;
 	};
 
 	getLatestAppFromMarketplace = async (appId, version) => {
-		const { app } = await APIClient.get(`apps/${appId}`, {
+		const { app } = await APIClient.get(`/apps/${appId}`, {
 			marketplace: 'true',
 			update: 'true',
 			appVersion: version,
@@ -112,27 +112,27 @@ class AppClientOrchestrator {
 	};
 
 	getAppSettings = async (appId) => {
-		const { settings } = await APIClient.get(`apps/${appId}/settings`);
+		const { settings } = await APIClient.get(`/apps/${appId}/settings`);
 		return settings;
 	};
 
 	setAppSettings = async (appId, settings) => {
-		const { updated } = await APIClient.post(`apps/${appId}/settings`, undefined, { settings });
+		const { updated } = await APIClient.post(`/apps/${appId}/settings`, undefined, { settings });
 		return updated;
 	};
 
 	getAppApis = async (appId) => {
-		const { apis } = await APIClient.get(`apps/${appId}/apis`);
+		const { apis } = await APIClient.get(`/apps/${appId}/apis`);
 		return apis;
 	};
 
 	getAppLanguages = async (appId) => {
-		const { languages } = await APIClient.get(`apps/${appId}/languages`);
+		const { languages } = await APIClient.get(`/apps/${appId}/languages`);
 		return languages;
 	};
 
 	installApp = async (appId, version, permissionsGranted) => {
-		const { app } = await APIClient.post('apps/', {
+		const { app } = await APIClient.post('/apps/', {
 			appId,
 			marketplace: true,
 			version,
@@ -142,7 +142,7 @@ class AppClientOrchestrator {
 	};
 
 	updateApp = async (appId, version, permissionsGranted) => {
-		const { app } = await APIClient.post(`apps/${appId}`, {
+		const { app } = await APIClient.post(`/apps/${appId}`, {
 			appId,
 			marketplace: true,
 			version,
@@ -151,31 +151,31 @@ class AppClientOrchestrator {
 		return app;
 	};
 
-	uninstallApp = (appId) => APIClient.delete(`apps/${appId}`);
+	uninstallApp = (appId) => APIClient.delete(`/apps/${appId}`);
 
-	syncApp = (appId) => APIClient.post(`apps/${appId}/sync`);
+	syncApp = (appId) => APIClient.post(`/apps/${appId}/sync`);
 
 	setAppStatus = async (appId, status) => {
-		const { status: effectiveStatus } = await APIClient.post(`apps/${appId}/status`, { status });
+		const { status: effectiveStatus } = await APIClient.post(`/apps/${appId}/status`, { status });
 		return effectiveStatus;
 	};
 
-	screenshots = (appId) => APIClient.get(`apps/${appId}/screenshots`);
+	screenshots = (appId) => APIClient.get(`/apps/${appId}/screenshots`);
 
 	enableApp = (appId) => this.setAppStatus(appId, 'manually_enabled');
 
 	disableApp = (appId) => this.setAppStatus(appId, 'manually_disabled');
 
 	buildExternalUrl = (appId, purchaseType = 'buy', details = false) =>
-		APIClient.get('apps', {
+		APIClient.get('/apps', {
 			buildExternalUrl: 'true',
 			appId,
 			purchaseType,
 			details,
 		});
 
 	getCategories = async () => {
-		const categories = await APIClient.get('apps', { categories: 'true' });
+		const categories = await APIClient.get('/apps', { categories: 'true' });
 		return categories;
 	};
 

apps/meteor/app/authorization/client/startup.js

@@ -8,7 +8,7 @@ import { rolesStreamer } from './lib/streamer';
 
 Meteor.startup(() => {
 	CachedCollectionManager.onLogin(async () => {
-		const { roles } = await APIClient.v1.get('roles.list');
+		const { roles } = await APIClient.get('/v1/roles.list');
 		// if a role is checked before this collection is populated, it will return undefined
 		Roles._collection._docs._map = new Map(roles.map((record) => [Roles._collection._docs._idStringify(record._id), record]));
 		Object.values(Roles._collection.queries).forEach((query) => Roles._collection._recomputeResults(query));

apps/meteor/app/authorization/server/methods/saveRole.ts

@@ -13,16 +13,16 @@ Meteor.methods({
 		methodDeprecationLogger.warn('authorization:saveRole will be deprecated in future versions of Rocket.Chat');
 		const userId = Meteor.userId();
 
-		if (!userId || !hasPermission(userId, 'access-permissions')) {
-			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed', {
+		if (!isRoleCreateProps(roleData)) {
+			throw new Meteor.Error('error-invalid-role-properties', 'The role properties are invalid.', {
 				method: 'authorization:saveRole',
-				action: 'Accessing_permissions',
 			});
 		}
 
-		if (!isRoleCreateProps(roleData)) {
-			throw new Meteor.Error('error-invalid-role-properties', 'The role properties are invalid.', {
+		if (!userId || !hasPermission(userId, 'access-permissions')) {
+			throw new Meteor.Error('error-action-not-allowed', 'Accessing permissions is not allowed', {
 				method: 'authorization:saveRole',
+				action: 'Accessing_permissions',
 			});
 		}
 

apps/meteor/app/emoji-custom/client/lib/emojiCustom.js

@@ -184,7 +184,7 @@ Meteor.startup(() =>
 		try {
 			const {
 				emojis: { update: emojis },
-			} = await APIClient.v1.get('emoji-custom.list');
+			} = await APIClient.get('/v1/emoji-custom.list');
 
 			emoji.packages.emojiCustom.emojisByCategory = { rocket: [] };
 			for (const currentEmoji of emojis) {