Regression: Empty custom-fields filter on Current Chats causing issues (#26720)

Co-authored-by: Kevin Aleman <kaleman960@gmail.com>

apps/meteor/app/livechat/imports/server/rest/rooms.js

@@ -21,7 +21,7 @@ API.v1.addRoute(
 	'livechat/rooms',
 	{ authRequired: true },
 	{
-		get() {
+		async get() {
 			const { offset, count } = this.getPaginationItems();
 			const { sort, fields } = this.parseJsonQuery();
 			const { agents, departmentId, open, tags, roomName, onhold } = this.requestParams();
@@ -32,6 +32,7 @@ API.v1.addRoute(
 			check(open, Match.Maybe(String));
 			check(onhold, Match.Maybe(String));
 			check(tags, Match.Maybe([String]));
+			check(customFields, Match.Maybe(String));
 
 			createdAt = validateDateParams('createdAt', createdAt);
 			closedAt = validateDateParams('closedAt', closedAt);
@@ -43,24 +44,29 @@ API.v1.addRoute(
 			}
 
 			if (customFields) {
-				customFields = JSON.parse(customFields);
+				try {
+					const parsedCustomFields = JSON.parse(customFields);
+					check(parsedCustomFields, Object);
+					// Model's already checking for the keys, so we don't need to do it here.
+					customFields = parsedCustomFields;
+				} catch (e) {
+					throw new Error('The "customFields" query parameter must be a valid JSON.');
+				}
 			}
 
 			return API.v1.success(
-				Promise.await(
-					findRooms({
-						agents,
-						roomName,
-						departmentId,
-						open: open && open === 'true',
-						createdAt,
-						closedAt,
-						tags,
-						customFields,
-						onhold,
-						options: { offset, count, sort, fields },
-					}),
-				),
+				await findRooms({
+					agents,
+					roomName,
+					departmentId,
+					open: open && open === 'true',
+					createdAt,
+					closedAt,
+					tags,
+					customFields,
+					onhold,
+					options: { offset, count, sort, fields },
+				}),
 			);
 		},
 	},

apps/meteor/server/models/raw/LivechatRooms.js

@@ -1057,7 +1057,7 @@ export class LivechatRoomsRaw extends BaseRaw {
 		if (tags) {
 			query.tags = { $in: tags };
 		}
-		if (customFields) {
+		if (customFields && Object.keys(customFields).length) {
 			query.$and = Object.keys(customFields).map((key) => ({
 				[`livechatData.${key}`]: new RegExp(customFields[key], 'i'),
 			}));