[pull] develop from RocketChat:develop

.changeset/odd-colts-doubt.md

@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes the `sort` parameter validation on `/api/v1/audit.settings` endpoint to accept string format.

apps/meteor/tests/end-to-end/api/settings.ts

@@ -535,5 +535,45 @@ describe('[Settings]', () => {
 					});
 			});
 		});
+
+		describe('Sorting', () => {
+			const isSortedAscending = (events: IServerEvents['settings.changed'][]) =>
+				events.every((event, i) => i === 0 || new Date(event.ts).getTime() >= new Date(events[i - 1].ts).getTime());
+
+			const isSortedDescending = (events: IServerEvents['settings.changed'][]) =>
+				events.every((event, i) => i === 0 || new Date(event.ts).getTime() <= new Date(events[i - 1].ts).getTime());
+
+			it('should sort by timestamp ascending', async () => {
+				const response = await request
+					.get(api('audit.settings'))
+					.query({ sort: JSON.stringify({ ts: 1 }), start: formatDate(startDate), end: formatDate(endDate) })
+					.set(credentials)
+					.expect(200);
+
+				expect(response.body).to.have.property('success', true);
+				expect(response.body.events).to.have.length.greaterThanOrEqual(2);
+				expect(isSortedAscending(response.body.events)).to.be.true;
+			});
+
+			it('should sort by timestamp descending', async () => {
+				const response = await request
+					.get(api('audit.settings'))
+					.query({ sort: JSON.stringify({ ts: -1 }), start: formatDate(startDate), end: formatDate(endDate) })
+					.set(credentials)
+					.expect(200);
+
+				expect(response.body).to.have.property('success', true);
+				expect(response.body.events).to.have.length.greaterThanOrEqual(2);
+				expect(isSortedDescending(response.body.events)).to.be.true;
+			});
+
+			it('should sort by timestamp descending by default', async () => {
+				const response = await request.get(api('audit.settings')).set(credentials).expect(200);
+
+				expect(response.body).to.have.property('success', true);
+				expect(response.body.events).to.have.length.greaterThanOrEqual(2);
+				expect(isSortedDescending(response.body.events)).to.be.true;
+			});
+		});
 	});
 });

packages/rest-typings/src/v1/server-events/ServerEventsAuditSettingsParamsGET.ts

@@ -18,14 +18,8 @@ const ServerEventsAuditSettingsParamsGetSchema = {
 	type: 'object',
 	properties: {
 		sort: {
-			type: 'object',
+			type: 'string',
 			nullable: true,
-			properties: {
-				ts: {
-					type: 'number',
-					nullable: true,
-				},
-			},
 		},
 		count: {
 			type: 'number',