fix(team): await default-room assignments when adding team members (#38701)

Author: Shreyas2004wagh

apps/meteor/server/services/team/service.ts

@@ -998,13 +998,11 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 		const defaultRooms = await Rooms.findDefaultRoomsForTeam(teamId).toArray();
 		const users = await Users.findActiveByIds(members.map((member) => member.userId)).toArray();
 
-		defaultRooms.map(async (room) => {
+		for (const room of defaultRooms) {
 			// at this point, users are already part of the team so we won't check for membership
-			for await (const user of users) {
-				// add each user to the default room
-				await addUserToRoom(room._id, user, inviter, { skipSystemMessage: false });
-			}
-		});
+			// eslint-disable-next-line no-await-in-loop
+			await Promise.all(users.map((user) => addUserToRoom(room._id, user, inviter, { skipSystemMessage: false })));
+		}
 	}
 
 	async deleteById(teamId: string): Promise<boolean> {

apps/meteor/tests/unit/server/services/team/service.tests.ts

@@ -0,0 +1,118 @@
+import { expect } from 'chai';
+import { beforeEach, describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const Rooms = {
+	findDefaultRoomsForTeam: sinon.stub(),
+};
+
+const Users = {
+	findActiveByIds: sinon.stub(),
+};
+
+const addUserToRoom = sinon.stub();
+
+const { TeamService } = proxyquire.noCallThru().load('../../../../../server/services/team/service', {
+	'@rocket.chat/core-services': {
+		Room: {},
+		Authorization: {},
+		Message: {},
+		ServiceClassInternal: class {},
+		api: {},
+	},
+	'@rocket.chat/models': {
+		Team: {},
+		Rooms,
+		Subscriptions: {},
+		Users,
+		TeamMember: {},
+	},
+	'@rocket.chat/string-helpers': {
+		escapeRegExp: (value: string) => value,
+	},
+	'../../../app/channel-settings/server': {
+		saveRoomName: sinon.stub(),
+	},
+	'../../../app/channel-settings/server/functions/saveRoomType': {
+		saveRoomType: sinon.stub(),
+	},
+	'../../../app/lib/server/functions/addUserToRoom': {
+		addUserToRoom,
+	},
+	'../../../app/lib/server/functions/checkUsernameAvailability': {
+		checkUsernameAvailability: sinon.stub(),
+	},
+	'../../../app/lib/server/functions/getRoomsWithSingleOwner': {
+		getSubscribedRoomsForUserWithDetails: sinon.stub(),
+	},
+	'../../../app/lib/server/functions/removeUserFromRoom': {
+		removeUserFromRoom: sinon.stub(),
+	},
+	'../../../app/lib/server/lib/notifyListener': {
+		notifyOnSubscriptionChangedByRoomIdAndUserId: sinon.stub(),
+		notifyOnRoomChangedById: sinon.stub(),
+	},
+	'../../../app/settings/server': {
+		settings: { get: sinon.stub() },
+	},
+});
+
+const service = new TeamService();
+
+describe('Team service', () => {
+	beforeEach(() => {
+		addUserToRoom.reset();
+		Rooms.findDefaultRoomsForTeam.reset();
+		Users.findActiveByIds.reset();
+	});
+
+	it('should wait for default room membership operations to finish', async function () {
+		this.timeout(15000);
+
+		addUserToRoom.onFirstCall().resolves(true);
+		addUserToRoom.onSecondCall().returns(
+			new Promise<void>((resolve) => {
+				setTimeout(() => {
+					resolve();
+				}, 20);
+			}),
+		);
+
+		Rooms.findDefaultRoomsForTeam.returns({
+			toArray: () => Promise.resolve([{ _id: 'default-room' }]),
+		});
+		Users.findActiveByIds.returns({
+			toArray: () =>
+				Promise.resolve([
+					{ _id: 'user-1', username: 'user-1' },
+					{ _id: 'user-2', username: 'user-2' },
+				]),
+		});
+
+		await service.addMembersToDefaultRooms({ _id: 'inviter', username: 'inviter' }, 'team-id', [
+			{ userId: 'user-1' },
+			{ userId: 'user-2' },
+		]);
+
+		expect(addUserToRoom.callCount).to.equal(2);
+	});
+
+	it('should propagate errors from default room membership operations', async function () {
+		this.timeout(15000);
+
+		addUserToRoom.rejects(new Error('room-add-failed'));
+		Rooms.findDefaultRoomsForTeam.returns({
+			toArray: () => Promise.resolve([{ _id: 'default-room' }]),
+		});
+		Users.findActiveByIds.returns({
+			toArray: () => Promise.resolve([{ _id: 'user-1', username: 'user-1' }]),
+		});
+
+		await expect(
+			service.addMembersToDefaultRooms({ _id: 'inviter', username: 'inviter' }, 'team-id', [{ userId: 'user-1' }]),
+		).to.be.rejectedWith('room-add-failed');
+
+		expect(addUserToRoom.callCount).to.equal(1);
+	});
+});