refactor(promise.await): createRoom.ts, createDirectRoom.ts and clean…

…RoomHistory.ts (#28492) Co-authored-by: Kevin Aleman <kaleman960@gmail.com> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
RocketChat · Mar 20, 2023 · 6dbf63b · 6dbf63b
1 parent 6d17b2b
commit 6dbf63b
Show file tree

Hide file tree

Showing 15 changed files with 64 additions and 76 deletions.
diff --git a/apps/meteor/app/discussion/server/methods/createDiscussion.ts b/apps/meteor/app/discussion/server/methods/createDiscussion.ts
@@ -58,7 +58,7 @@ type CreateDiscussionProperties = {
 	encrypted?: boolean;
 };
 
-const create = ({ prid, pmid, t_name: discussionName, reply, users, user, encrypted }: CreateDiscussionProperties) => {
+const create = async ({ prid, pmid, t_name: discussionName, reply, users, user, encrypted }: CreateDiscussionProperties) => {
 	// if you set both, prid and pmid, and the rooms dont match... should throw an error)
 	let message: undefined | IMessage;
 	if (pmid) {
@@ -138,7 +138,7 @@ const create = ({ prid, pmid, t_name: discussionName, reply, users, user, encryp
 		});
 	}
 
-	const discussion = createRoom(
+	const discussion = await createRoom(
 		type,
 		name,
 		user.username as string,
@@ -196,7 +196,7 @@ Meteor.methods<ServerMethods>({
 	 * @param {string[]} users - users to be added
 	 * @param {boolean} encrypted - if the discussion's e2e encryption should be enabled.
 	 */
-	createDiscussion({ prid, pmid, t_name: discussionName, reply, users, encrypted }: CreateDiscussionProperties) {
+	async createDiscussion({ prid, pmid, t_name: discussionName, reply, users, encrypted }: CreateDiscussionProperties) {
 		if (!settings.get('Discussion_enabled')) {
 			throw new Meteor.Error('error-action-not-allowed', 'You are not allowed to create a discussion', { method: 'createDiscussion' });
 		}

diff --git a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/joinedChannel.js
@@ -14,7 +14,7 @@ export default async function handleJoinedChannel(args) {
 	let room = Rooms.findOneByName(args.roomName);
 
 	if (!room) {
-		const createdRoom = createRoom('c', args.roomName, user.username, []);
+		const createdRoom = await createRoom('c', args.roomName, user.username, []);
 		room = Rooms.findOne({ _id: createdRoom.rid });
 
 		this.log(`${user.username} created room ${args.roomName}`);

diff --git a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
@@ -1,4 +1,3 @@
-import type { FindCursor } from 'mongodb';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import type { IMessage, IMessageDiscussion } from '@rocket.chat/core-typings';
 import { api } from '@rocket.chat/core-services';
@@ -45,14 +44,10 @@ export const cleanRoomHistory = function ({
 	}
 
 	if (!ignoreDiscussion) {
-		Promise.await(
-			(
-				Messages.findDiscussionByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers, {
-					fields: { drid: 1 },
-					...(limit && { limit }),
-				}) as FindCursor<IMessageDiscussion>
-			).forEach(({ drid }) => deleteRoom(drid)),
-		);
+		Messages.findDiscussionByRoomIdPinnedTimestampAndUsers(rid, excludePinned, ts, fromUsers, {
+			fields: { drid: 1 },
+			...(limit && { limit }),
+		}).forEach(({ drid }: IMessageDiscussion) => deleteRoom(drid));
 	}
 
 	if (!ignoreThreads) {

diff --git a/apps/meteor/app/lib/server/functions/createDirectRoom.ts b/apps/meteor/app/lib/server/functions/createDirectRoom.ts
@@ -93,22 +93,19 @@ export async function createDirectRoom(
 			_USERNAMES: usernames,
 		};
 
-		const prevent = Promise.await(
-			Apps.triggerEvent('IPreRoomCreatePrevent', tmpRoom).catch((error) => {
-				if (error instanceof AppsEngineException) {
-					throw new Meteor.Error('error-app-prevented', error.message);
-				}
-
-				throw error;
-			}),
-		);
+		const prevent = await Apps.triggerEvent('IPreRoomCreatePrevent', tmpRoom).catch((error) => {
+			if (error instanceof AppsEngineException) {
+				throw new Meteor.Error('error-app-prevented', error.message);
+			}
+
+			throw error;
+		});
+
 		if (prevent) {
 			throw new Meteor.Error('error-app-prevented', 'A Rocket.Chat App prevented the room creation.');
 		}
 
-		const result = Promise.await(
-			Apps.triggerEvent('IPreRoomCreateModify', Promise.await(Apps.triggerEvent('IPreRoomCreateExtend', tmpRoom))),
-		);
+		const result = await Apps.triggerEvent('IPreRoomCreateModify', await Apps.triggerEvent('IPreRoomCreateExtend', tmpRoom));
 
 		if (typeof result === 'object') {
 			Object.assign(roomInfo, result);

diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts
@@ -16,20 +16,20 @@ const isValidName = (name: unknown): name is string => {
 };
 
 // eslint-disable-next-line complexity
-export const createRoom = <T extends RoomType>(
+export const createRoom = async <T extends RoomType>(
 	type: T,
 	name: T extends 'd' ? undefined : string,
 	ownerUsername: string | undefined,
 	members: T extends 'd' ? IUser[] : string[] = [],
 	readOnly?: boolean,
 	roomExtraData?: Partial<IRoom> & { customFields?: unknown },
 	options?: ICreateRoomParams['options'],
-): ICreatedRoom => {
+): Promise<ICreatedRoom> => {
 	const { teamId, ...extraData } = roomExtraData || ({} as IRoom);
 	callbacks.run('beforeCreateRoom', { type, name, owner: ownerUsername, members, readOnly, extraData, options });
 
 	if (type === 'd') {
-		return Promise.await(createDirectRoom(members as IUser[], extraData, { ...options, creator: options?.creator || ownerUsername }));
+		return createDirectRoom(members as IUser[], extraData, { ...options, creator: options?.creator || ownerUsername });
 	}
 
 	if (!isValidName(name)) {
@@ -81,7 +81,7 @@ export const createRoom = <T extends RoomType>(
 	};
 
 	if (teamId) {
-		const team = Promise.await(Team.getOneById(teamId, { projection: { _id: 1 } }));
+		const team = await Team.getOneById(teamId, { projection: { _id: 1 } });
 		if (team) {
 			roomProps.teamId = team._id;
 		}
@@ -92,23 +92,19 @@ export const createRoom = <T extends RoomType>(
 		_USERNAMES: members,
 	};
 
-	const prevent = Promise.await(
-		Apps.triggerEvent('IPreRoomCreatePrevent', tmp).catch((error) => {
-			if (error instanceof AppsEngineException) {
-				throw new Meteor.Error('error-app-prevented', error.message);
-			}
+	const prevent = await Apps.triggerEvent('IPreRoomCreatePrevent', tmp).catch((error) => {
+		if (error instanceof AppsEngineException) {
+			throw new Meteor.Error('error-app-prevented', error.message);
+		}
 
-			throw error;
-		}),
-	);
+		throw error;
+	});
 
 	if (prevent) {
 		throw new Meteor.Error('error-app-prevented', 'A Rocket.Chat App prevented the room creation.');
 	}
 
-	const eventResult = Promise.await(
-		Apps.triggerEvent('IPreRoomCreateModify', Promise.await(Apps.triggerEvent('IPreRoomCreateExtend', tmp))),
-	);
+	const eventResult = await Apps.triggerEvent('IPreRoomCreateModify', await Apps.triggerEvent('IPreRoomCreateExtend', tmp));
 
 	if (eventResult && typeof eventResult === 'object' && delete eventResult._USERNAMES) {
 		Object.assign(roomProps, eventResult);
@@ -164,7 +160,7 @@ export const createRoom = <T extends RoomType>(
 
 	if (type === 'c') {
 		if (room.teamId) {
-			const team = Promise.await(Team.getOneById(room.teamId));
+			const team = await Team.getOneById(room.teamId);
 			team && Messages.createUserAddRoomToTeamWithRoomIdAndUser(team.roomId, room.name, owner);
 		}
 		callbacks.run('afterCreateChannel', owner, room);

diff --git a/apps/meteor/app/lib/server/methods/createChannel.ts b/apps/meteor/app/lib/server/methods/createChannel.ts
@@ -20,7 +20,7 @@ declare module '@rocket.chat/ui-contexts' {
 }
 
 Meteor.methods<ServerMethods>({
-	createChannel(name, members, readOnly = false, customFields = {}, extraData = {}) {
+	async createChannel(name, members, readOnly = false, customFields = {}, extraData = {}) {
 		check(name, String);
 		check(members, Match.Optional([String]));
 

diff --git a/apps/meteor/app/lib/server/methods/createPrivateGroup.js b/apps/meteor/app/lib/server/methods/createPrivateGroup.js
@@ -5,7 +5,7 @@ import { hasPermission } from '../../../authorization/server';
 import { createRoom } from '../functions';
 
 Meteor.methods({
-	createPrivateGroup(name, members, readOnly = false, customFields = {}, extraData = {}) {
+	async createPrivateGroup(name, members, readOnly = false, customFields = {}, extraData = {}) {
 		check(name, String);
 		check(members, Match.Optional([String]));
 

diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts
@@ -166,7 +166,7 @@ export class SAML {
 			user = Users.findOne(userId);
 
 			if (userObject.channels && channelsAttributeUpdate !== true) {
-				SAML.subscribeToSAMLChannels(userObject.channels, user);
+				await SAML.subscribeToSAMLChannels(userObject.channels, user);
 			}
 		}
 
@@ -205,7 +205,7 @@ export class SAML {
 		}
 
 		if (userObject.channels && channelsAttributeUpdate === true) {
-			SAML.subscribeToSAMLChannels(userObject.channels, user);
+			await SAML.subscribeToSAMLChannels(userObject.channels, user);
 		}
 
 		Users.update(
@@ -467,10 +467,10 @@ export class SAML {
 			.replace(/^\w/, (u) => u.toUpperCase());
 	}
 
-	private static subscribeToSAMLChannels(channels: Array<string>, user: IUser): void {
+	private static async subscribeToSAMLChannels(channels: Array<string>, user: IUser): Promise<void> {
 		const { includePrivateChannelsInUpdate } = SAMLUtils.globalSettings;
 		try {
-			for (let roomName of channels) {
+			for await (let roomName of channels) {
 				roomName = roomName.trim();
 				if (!roomName) {
 					continue;
@@ -492,7 +492,7 @@ export class SAML {
 				if (!room && !privRoom) {
 					// If the user doesn't have an username yet, we can't create new rooms for them
 					if (user.username) {
-						createRoom('c', roomName, user.username);
+						await createRoom('c', roomName, user.username);
 					}
 				}
 			}

diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js
@@ -226,7 +226,7 @@ export default class RocketAdapter {
 		}
 	}
 
-	getChannel(slackMessage) {
+	async getChannel(slackMessage) {
 		return slackMessage.channel ? this.findChannel(slackMessage.channel) || this.addChannel(slackMessage.channel) : null;
 	}
 
@@ -259,11 +259,11 @@ export default class RocketAdapter {
 		return slackChannel.creator ? this.findUser(slackChannel.creator) || this.addUser(slackChannel.creator) : null;
 	}
 
-	addChannel(slackChannelID, hasRetried = false) {
+	async addChannel(slackChannelID, hasRetried = false) {
 		rocketLogger.debug('Adding Rocket.Chat channel from Slack', slackChannelID);
 		let addedRoom;
 
-		this.slackAdapters.forEach((slack) => {
+		for await (const slack of this.slackAdapters) {
 			if (addedRoom) {
 				return;
 			}
@@ -292,7 +292,7 @@ export default class RocketAdapter {
 
 					try {
 						const isPrivate = slackChannel.is_private;
-						const rocketChannel = createRoom(isPrivate ? 'p' : 'c', slackChannel.name, rocketUserCreator.username, rocketUsers);
+						const rocketChannel = await createRoom(isPrivate ? 'p' : 'c', slackChannel.name, rocketUserCreator.username, rocketUsers);
 						rocketChannel.rocketId = rocketChannel.rid;
 					} catch (e) {
 						if (!hasRetried) {
@@ -324,7 +324,7 @@ export default class RocketAdapter {
 
 				addedRoom = Rooms.findOneById(slackChannel.rocketId);
 			}
-		});
+		}
 
 		if (!addedRoom) {
 			rocketLogger.debug('Channel not added');

diff --git a/apps/meteor/app/slackbridge/server/SlackAdapter.js b/apps/meteor/app/slackbridge/server/SlackAdapter.js
@@ -477,10 +477,10 @@ export default class SlackAdapter {
 		if (slackMessage.subtype) {
 			switch (slackMessage.subtype) {
 				case 'message_deleted':
-					this.processMessageDeleted(slackMessage);
+					await this.processMessageDeleted(slackMessage);
 					break;
 				case 'message_changed':
-					this.processMessageChanged(slackMessage);
+					await this.processMessageChanged(slackMessage);
 					break;
 				case 'channel_join':
 					this.processChannelJoin(slackMessage);
@@ -784,7 +784,7 @@ export default class SlackAdapter {
 		const file = slackMessage.files[0];
 
 		if (file && file.url_private_download !== undefined) {
-			const rocketChannel = this.rocket.getChannel(slackMessage);
+			const rocketChannel = await this.rocket.getChannel(slackMessage);
 			const rocketUser = this.rocket.getUser(slackMessage.user);
 
 			// Hack to notify that a file was attempted to be uploaded
@@ -811,9 +811,9 @@ export default class SlackAdapter {
 	/*
 	 https://api.slack.com/events/message/message_deleted
 	 */
-	processMessageDeleted(slackMessage) {
+	async processMessageDeleted(slackMessage) {
 		if (slackMessage.previous_message) {
-			const rocketChannel = this.rocket.getChannel(slackMessage);
+			const rocketChannel = await this.rocket.getChannel(slackMessage);
 			const rocketUser = Users.findOneById('rocket.cat', { fields: { username: 1 } });
 
 			if (rocketChannel && rocketUser) {
@@ -837,13 +837,13 @@ export default class SlackAdapter {
 	/*
 	 https://api.slack.com/events/message/message_changed
 	 */
-	processMessageChanged(slackMessage) {
+	async processMessageChanged(slackMessage) {
 		if (slackMessage.previous_message) {
 			const currentMsg = Messages.findOneById(this.rocket.createRocketID(slackMessage.channel, slackMessage.message.ts));
 
 			// Only process this change, if its an actual update (not just Slack repeating back our Rocket original change)
 			if (currentMsg && slackMessage.message.text !== currentMsg.msg) {
-				const rocketChannel = this.rocket.getChannel(slackMessage);
+				const rocketChannel = await this.rocket.getChannel(slackMessage);
 				const rocketUser = slackMessage.previous_message.user
 					? this.rocket.findUser(slackMessage.previous_message.user) || this.rocket.addUser(slackMessage.previous_message.user)
 					: null;
@@ -866,7 +866,7 @@ export default class SlackAdapter {
 	 This method will get refactored and broken down into single responsibilities
 	 */
 	async processNewMessage(slackMessage, isImporting) {
-		const rocketChannel = this.rocket.getChannel(slackMessage);
+		const rocketChannel = await this.rocket.getChannel(slackMessage);
 		let rocketUser = null;
 		if (slackMessage.subtype === 'bot_message') {
 			rocketUser = Users.findOneById('rocket.cat', { fields: { username: 1 } });

diff --git a/apps/meteor/app/utils/lib/slashCommand.ts b/apps/meteor/app/utils/lib/slashCommand.ts
@@ -79,7 +79,7 @@ export const slashCommands = {
 			throw new Meteor.Error('invalid-command-usage', 'Executing a command requires at least a message with a room id.');
 		}
 
-		const previewInfo = cmd.previewer(command, params, message);
+		const previewInfo = Promise.await(cmd.previewer(command, params, message));
 
 		if (!previewInfo?.items?.length) {
 			return;
@@ -113,7 +113,7 @@ export const slashCommands = {
 			throw new Meteor.Error('error-invalid-preview', 'Preview Item must have an id, type, and value.');
 		}
 
-		return cmd.previewCallback(command, params, message, preview, triggerId);
+		return Promise.await(cmd.previewCallback(command, params, message, preview, triggerId));
 	},
 };
 

diff --git a/apps/meteor/ee/server/configuration/oauth.ts b/apps/meteor/ee/server/configuration/oauth.ts
@@ -55,13 +55,13 @@ function getChannelsMap(channelsMap: string): Record<string, any> | undefined {
 }
 
 onLicense('oauth-enterprise', () => {
-	callbacks.add('afterProcessOAuthUser', (auth: IOAuthUserService) => {
+	callbacks.add('afterProcessOAuthUser', async (auth: IOAuthUserService) => {
 		auth.serviceName = capitalize(auth.serviceName);
 		const settings = getOAuthSettings(auth.serviceName);
 
 		if (settings.mapChannels) {
 			const channelsMap = getChannelsMap(settings.channelsMap);
-			OAuthEEManager.mapSSOGroupsToChannels(auth.user, auth.serviceData, settings.groupsClaim, channelsMap, settings.channelsAdmin);
+			await OAuthEEManager.mapSSOGroupsToChannels(auth.user, auth.serviceData, settings.groupsClaim, channelsMap, settings.channelsAdmin);
 		}
 
 		if (settings.mergeRoles) {
@@ -80,7 +80,7 @@ onLicense('oauth-enterprise', () => {
 
 		if (settings.mapChannels) {
 			const channelsMap = getChannelsMap(settings.channelsMap);
-			OAuthEEManager.mapSSOGroupsToChannels(auth.user, auth.identity, settings.groupsClaim, channelsMap, settings.channelsAdmin);
+			await OAuthEEManager.mapSSOGroupsToChannels(auth.user, auth.identity, settings.groupsClaim, channelsMap, settings.channelsAdmin);
 		}
 
 		if (settings.mergeRoles) {

diff --git a/apps/meteor/ee/server/lib/ldap/Manager.ts b/apps/meteor/ee/server/lib/ldap/Manager.ts
@@ -247,12 +247,12 @@ export class LDAPEEManager extends LDAPManager {
 		});
 	}
 
-	private static createRoomForSync(channel: string): IRoom | undefined {
+	private static async createRoomForSync(channel: string): Promise<IRoom | undefined> {
 		logger.debug(`Channel '${channel}' doesn't exist, creating it.`);
 
 		const roomOwner = settings.get<string>('LDAP_Sync_User_Data_Channels_Admin') || '';
 		// #ToDo: Remove typecastings when createRoom is converted to ts.
-		const room = createRoom('c', channel, roomOwner, [], false, {
+		const room = await createRoom('c', channel, roomOwner, [], false, {
 			customFields: { ldap: true },
 		} as any);
 		if (!room?.rid) {
@@ -302,7 +302,7 @@ export class LDAPEEManager extends LDAPManager {
 			const channels: Array<string> = [].concat(fieldMap[ldapField]);
 			for await (const channel of channels) {
 				try {
-					const room: IRoom | undefined = Rooms.findOneByNonValidatedName(channel) || this.createRoomForSync(channel);
+					const room: IRoom | undefined = Rooms.findOneByNonValidatedName(channel) || (await this.createRoomForSync(channel));
 					if (!room) {
 						return;
 					}