chore: fix AJV strictTypes warnings in rest-typings oneOf branches (RocketChat#40282)

Author: KevLehman

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

@@ -70,7 +70,6 @@ const invites = API.v1
 			authRequired: true,
 			response: {
 				200: ajv.compile<IInvite[]>({
-					additionalProperties: false,
 					type: 'array',
 					items: {
 						$ref: '#/components/schemas/IInvite',

packages/rest-typings/src/v1/channels/ChannelsFilesListProps.ts

@@ -49,7 +49,10 @@ const channelsFilesListPropsSchema = {
 			type: 'boolean',
 		},
 	},
-	oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
+	oneOf: [
+		{ type: 'object', required: ['roomId'] },
+		{ type: 'object', required: ['roomName'] },
+	],
 	required: [],
 	additionalProperties: false,
 };

packages/rest-typings/src/v1/dm/DmFileProps.ts

@@ -49,7 +49,10 @@ const dmFilesListPropsSchema = {
 			type: 'boolean',
 		},
 	},
-	oneOf: [{ required: ['roomId'] }, { required: ['username'] }],
+	oneOf: [
+		{ type: 'object', required: ['roomId'] },
+		{ type: 'object', required: ['username'] },
+	],
 	required: [],
 	additionalProperties: false,
 };

packages/rest-typings/src/v1/groups/GroupsFilesProps.ts

@@ -47,7 +47,10 @@ const GroupsFilesPropsSchema = {
 			type: 'boolean',
 		},
 	},
-	oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
+	oneOf: [
+		{ type: 'object', required: ['roomId'] },
+		{ type: 'object', required: ['roomName'] },
+	],
 	required: [],
 	additionalProperties: true, // keep additional properties for backwards compatibility, otherwise this would be a breaking change
 };

packages/rest-typings/src/v1/moderation/ArchiveReportProps.ts

@@ -27,7 +27,10 @@ const archiveReportPropsSchema = {
 			nullable: true,
 		},
 	},
-	oneOf: [{ required: ['msgId'] }, { required: ['userId'] }],
+	oneOf: [
+		{ type: 'object', required: ['msgId'] },
+		{ type: 'object', required: ['userId'] },
+	],
 	additionalProperties: false,
 };
 

packages/rest-typings/src/v1/rooms.ts

@@ -499,7 +499,10 @@ const RoomsIsMemberPropsSchema = {
 		userId: { type: 'string', minLength: 1 },
 		username: { type: 'string', minLength: 1 },
 	},
-	oneOf: [{ required: ['roomId', 'userId'] }, { required: ['roomId', 'username'] }],
+	oneOf: [
+		{ type: 'object', required: ['roomId', 'userId'] },
+		{ type: 'object', required: ['roomId', 'username'] },
+	],
 	additionalProperties: false,
 };
 
@@ -770,6 +773,7 @@ type MembersOrderedByRoleProps = {
 export type RoomsMembersOrderedByRoleProps = PaginatedRequest<MembersOrderedByRoleProps>;
 
 const membersOrderedByRoleRolePropsSchema = {
+	type: 'object',
 	properties: {
 		roomId: {
 			type: 'string',
@@ -796,7 +800,10 @@ const membersOrderedByRoleRolePropsSchema = {
 			type: 'string',
 		},
 	},
-	oneOf: [{ required: ['roomId'] }, { required: ['roomName'] }],
+	oneOf: [
+		{ type: 'object', required: ['roomId'] },
+		{ type: 'object', required: ['roomName'] },
+	],
 	additionalProperties: false,
 };
 

packages/rest-typings/src/v1/teams/TeamsInfoProps.ts

@@ -8,7 +8,10 @@ const teamsInfoPropsSchema = {
 		teamId: { type: 'string' },
 		teamName: { type: 'string' },
 	},
-	oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
+	oneOf: [
+		{ type: 'object', required: ['teamId'] },
+		{ type: 'object', required: ['teamName'] },
+	],
 	additionalProperties: false,
 };
 

packages/rest-typings/src/v1/teams/TeamsListChildren.ts

@@ -30,7 +30,11 @@ const TeamsListChildrenPropsSchema = {
 		sort: { type: 'string' },
 	},
 	additionalProperties: false,
-	oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }, { required: ['roomId'] }],
+	oneOf: [
+		{ type: 'object', required: ['teamId'] },
+		{ type: 'object', required: ['teamName'] },
+		{ type: 'object', required: ['roomId'] },
+	],
 };
 
 export const isTeamsListChildrenProps = ajvQuery.compile<TeamsListChildrenProps>(TeamsListChildrenPropsSchema);

packages/rest-typings/src/v1/teams/TeamsListRoomsOfUserProps.ts

@@ -19,7 +19,10 @@ const teamsListRoomsOfUserPropsSchema = {
 		count: { type: 'number', nullable: true },
 		sort: { type: 'string', nullable: true },
 	},
-	oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
+	oneOf: [
+		{ type: 'object', required: ['teamId'] },
+		{ type: 'object', required: ['teamName'] },
+	],
 	required: ['userId'],
 	additionalProperties: false,
 };

packages/rest-typings/src/v1/teams/TeamsListRoomsProps.ts

@@ -19,7 +19,10 @@ const teamsListRoomsPropsSchema = {
 		count: { type: 'number', nullable: true },
 		sort: { type: 'string', nullable: true },
 	},
-	oneOf: [{ required: ['teamId'] }, { required: ['teamName'] }],
+	oneOf: [
+		{ type: 'object', required: ['teamId'] },
+		{ type: 'object', required: ['teamName'] },
+	],
 	additionalProperties: false,
 };