Regression: Search on Member List

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

@@ -1,7 +1,7 @@
 /**
  * Docs: https://github.com/RocketChat/developer-docs/blob/master/reference/api/rest-api/endpoints/team-collaboration-endpoints/im-endpoints
  */
-import type { IMessage, IRoom, ISetting, ISubscription, IUpload } from '@rocket.chat/core-typings';
+import type { IMessage, IRoom, ISubscription, IUpload } from '@rocket.chat/core-typings';
 import {
 	isDmDeleteProps,
 	isDmFileProps,
@@ -12,7 +12,7 @@ import {
 } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
-import { Subscriptions, Uploads, Messages, Rooms, Settings, Users } from '@rocket.chat/models';
+import { Subscriptions, Uploads, Messages, Rooms, Users } from '@rocket.chat/models';
 
 import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
 import { hasPermission } from '../../../authorization/server';
@@ -21,6 +21,7 @@ import { API } from '../api';
 import { getRoomByNameOrIdWithOptionToJoin } from '../../../lib/server/functions/getRoomByNameOrIdWithOptionToJoin';
 import { createDirectMessage } from '../../../../server/methods/createDirectMessage';
 import { addUserToFileObj } from '../helpers/addUserToFileObj';
+import { settings } from '../../../settings/server';
 
 interface IImFilesObject extends IUpload {
 	userId: string;
@@ -310,7 +311,9 @@ API.v1.addRoute(
 				limit: count,
 			};
 
-			const { cursor, totalCount } = Users.findPaginatedByActiveUsersExcept(filter, [], options, null, [extraQuery]);
+			const searchFields = settings.get<string>('Accounts_SearchFields').trim().split(',');
+
+			const { cursor, totalCount } = Users.findPaginatedByActiveUsersExcept(filter, [], options, searchFields, [extraQuery]);
 
 			const [members, total] = await Promise.all([cursor.toArray(), totalCount]);
 
@@ -369,13 +372,7 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async get() {
-			const settings = await Settings.findOne<ISetting>(
-				{ _id: 'API_Enable_Direct_Message_History_EndPoint' },
-				{
-					projection: { _id: 1, value: 1 },
-				},
-			);
-			if (settings?.value !== true) {
+			if (settings.get('API_Enable_Direct_Message_History_EndPoint') !== true) {
 				throw new Meteor.Error('error-endpoint-disabled', 'This endpoint is disabled', {
 					route: '/api/v1/im.messages.others',
 				});

apps/meteor/server/lib/findUsersOfRoom.ts

@@ -39,7 +39,9 @@ export function findUsersOfRoom({
 		...(limit > 0 && { limit }),
 	};
 
-	return Users.findPaginatedByActiveUsersExcept(filter, undefined, options, undefined, [
+	const searchFields = settings.get<string>('Accounts_SearchFields').trim().split(',');
+
+	return Users.findPaginatedByActiveUsersExcept(filter, undefined, options, searchFields, [
 		{
 			__rooms: rid,
 			...(status && { status }),

apps/meteor/server/methods/browseChannels.js

@@ -160,7 +160,8 @@ async function getTeams(user, searchTerm, sort, pagination) {
 }
 
 async function findUsers({ text, sort, pagination, workspace, viewFullOtherUserInfo }) {
-	const forcedSearchFields = workspace === 'all' && ['username', 'name', 'emails.address'];
+	const searchFields =
+		workspace === 'all' ? ['username', 'name', 'emails.address'] : settings.get('Accounts_SearchFields').trim().split(',');
 
 	const options = {
 		...pagination,
@@ -178,7 +179,7 @@ async function findUsers({ text, sort, pagination, workspace, viewFullOtherUserI
 	};
 
 	if (workspace === 'all') {
-		const { cursor, totalCount } = Users.findPaginatedByActiveUsersExcept(text, [], options, forcedSearchFields);
+		const { cursor, totalCount } = Users.findPaginatedByActiveUsersExcept(text, [], options, searchFields);
 		const [results, total] = await Promise.all([cursor.toArray(), totalCount]);
 		return {
 			total,
@@ -187,21 +188,15 @@ async function findUsers({ text, sort, pagination, workspace, viewFullOtherUserI
 	}
 
 	if (workspace === 'external') {
-		const { cursor, totalCount } = Users.findPaginatedByActiveLocalUsersExcept(
-			text,
-			[],
-			options,
-			forcedSearchFields,
-			getFederationDomain(),
-		);
+		const { cursor, totalCount } = Users.findPaginatedByActiveExternalUsersExcept(text, [], options, searchFields, getFederationDomain());
 		const [results, total] = await Promise.all([cursor.toArray(), totalCount]);
 		return {
 			total,
 			results,
 		};
 	}
 
-	const { cursor, totalCount } = Users.findPaginatedByActiveLocalUsersExcept(text, [], options, forcedSearchFields, getFederationDomain());
+	const { cursor, totalCount } = Users.findPaginatedByActiveLocalUsersExcept(text, [], options, searchFields, getFederationDomain());
 	const [results, total] = await Promise.all([cursor.toArray(), totalCount]);
 	return {
 		total,

apps/meteor/tests/end-to-end/api/02-channels.js

@@ -1043,6 +1043,7 @@ describe('[Channels]', function () {
 			})
 			.end(done);
 	});
+
 	describe('/channels.members', () => {
 		it('should return an array of members by channel', (done) => {
 			request
@@ -1062,6 +1063,7 @@ describe('[Channels]', function () {
 				})
 				.end(done);
 		});
+
 		it('should return an array of members by channel even requested with count and offset params', (done) => {
 			request
 				.get(api('channels.members'))
@@ -1082,6 +1084,27 @@ describe('[Channels]', function () {
 				})
 				.end(done);
 		});
+
+		it('should return an filtered array of members by channel', (done) => {
+			request
+				.get(api('channels.members'))
+				.set(credentials)
+				.query({
+					roomId: channel._id,
+					filter: 'rocket.cat',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('members').and.to.be.an('array');
+					expect(res.body).to.have.property('count');
+					expect(res.body).to.have.property('count', 1);
+					expect(res.body).to.have.property('total');
+					expect(res.body).to.have.property('offset');
+				})
+				.end(done);
+		});
 	});
 
 	it('/channels.rename', async () => {