Merge branch 'develop' into quote-messages

Author: jessicaschelly

apps/meteor/app/api/server/ApiClass.ts

@@ -5,7 +5,7 @@ import { Logger } from '@rocket.chat/logger';
 import { Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import type { JoinPathPattern, Method } from '@rocket.chat/rest-typings';
-import { ajv } from '@rocket.chat/rest-typings/src/v1/Ajv';
+import { ajv } from '@rocket.chat/rest-typings';
 import { wrapExceptions } from '@rocket.chat/tools';
 import type { ValidateFunction } from 'ajv';
 import { Accounts } from 'meteor/accounts-base';
@@ -66,8 +66,13 @@ export type Prettify<T> = {
 
 type ExtractValidation<T> = T extends ValidateFunction<infer TSchema> ? TSchema : never;
 
-export type ExtractRoutesFromAPI<T> =
-	T extends APIClass<any, infer TOperations> ? (TOperations extends MinimalRoute ? Prettify<ConvertToRoute<TOperations>> : never) : never;
+type UnionToIntersection<U> = (U extends any ? (x: U) => any : never) extends (x: infer I) => any ? I : never;
+
+export type ExtractRoutesFromAPI<T> = Prettify<
+	UnionToIntersection<
+		T extends APIClass<any, infer TOperations> ? (TOperations extends MinimalRoute ? Prettify<ConvertToRoute<TOperations>> : never) : never
+	>
+>;
 
 type ConvertToRoute<TRoute extends MinimalRoute> = {
 	[K in TRoute['path']]: {
@@ -578,7 +583,7 @@ export class APIClass<
 		TSubPathPattern extends string,
 		TOptions extends TypedOptions,
 		TPathPattern extends `${TBasePath}/${TSubPathPattern}`,
-	>(method: Method, subpath: TSubPathPattern, options: TOptions): void {
+	>(method: MinimalRoute['method'], subpath: TSubPathPattern, options: TOptions): void {
 		const path = `/${this.apiPath}/${subpath}`.replaceAll('//', '/') as TPathPattern;
 		this.typedRoutes = this.typedRoutes || {};
 		this.typedRoutes[path] = this.typedRoutes[subpath] || {};
@@ -629,7 +634,7 @@ export class APIClass<
 	}
 
 	private method<TSubPathPattern extends string, TOptions extends TypedOptions, TPathPattern extends `${TBasePath}/${TSubPathPattern}`>(
-		method: Method,
+		method: MinimalRoute['method'],
 		subpath: TSubPathPattern,
 		options: TOptions,
 		action: TypedAction<TOptions, TSubPathPattern>,

apps/meteor/app/api/server/default/openApi.ts

@@ -1,3 +1,4 @@
+import { schemas } from '@rocket.chat/core-typings';
 import type { Route } from '@rocket.chat/http-router';
 import { isOpenAPIJSONEndpoint } from '@rocket.chat/rest-typings';
 import express from 'express';
@@ -65,8 +66,9 @@ const makeOpenAPIResponse = (paths: Record<string, Record<string, Route>>) => ({
 				name: 'X-Auth-Token',
 			},
 		},
-		schemas: {},
+		schemas: schemas.components.schemas,
 	},
+	schemas: schemas.components.schemas,
 	paths,
 });
 

apps/meteor/app/api/server/definition.ts

@@ -88,7 +88,7 @@ export type NonEnterpriseTwoFactorOptions = {
 	twoFactorOptions: ITwoFactorOptions;
 };
 
-export type Options = SharedOptions<Method>;
+export type Options = SharedOptions<'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH'>;
 
 export type SharedOptions<TMethod extends string> = (
 	| {

apps/meteor/app/api/server/v1/custom-sounds.ts

@@ -1,7 +1,7 @@
 import type { ICustomSound } from '@rocket.chat/core-typings';
 import { CustomSounds } from '@rocket.chat/models';
 import type { PaginatedRequest, PaginatedResult } from '@rocket.chat/rest-typings';
-import { ajv } from '@rocket.chat/rest-typings/src/v1/Ajv';
+import { ajv } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 
 import type { ExtractRoutesFromAPI } from '../ApiClass';

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

@@ -1,7 +1,6 @@
 import { Federation, FederationEE } from '@rocket.chat/core-services';
 import { License } from '@rocket.chat/license';
-import { isFederationVerifyMatrixIdProps } from '@rocket.chat/rest-typings';
-import { ajv } from '@rocket.chat/rest-typings/src/v1/Ajv';
+import { ajv, isFederationVerifyMatrixIdProps } from '@rocket.chat/rest-typings';
 
 import { API } from '../api';
 

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

@@ -1,11 +1,11 @@
 import type { IInvite } from '@rocket.chat/core-typings';
 import {
+	ajv,
 	isFindOrCreateInviteParams,
 	isUseInviteTokenProps,
 	isValidateInviteTokenProps,
 	isSendInvitationEmailParams,
 } from '@rocket.chat/rest-typings';
-import { ajv } from '@rocket.chat/rest-typings/src/v1/Ajv';
 
 import { findOrCreateInvite } from '../../../invites/server/functions/findOrCreateInvite';
 import { listInvites } from '../../../invites/server/functions/listInvites';

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

@@ -1,7 +1,7 @@
 import { api } from '@rocket.chat/core-services';
 import type { IWebdavAccount, IWebdavAccountIntegration } from '@rocket.chat/core-typings';
 import { WebdavAccounts } from '@rocket.chat/models';
-import { ajv } from '@rocket.chat/rest-typings/src/v1/Ajv';
+import { ajv } from '@rocket.chat/rest-typings';
 import type { DeleteResult } from 'mongodb';
 
 import type { ExtractRoutesFromAPI } from '../ApiClass';

apps/meteor/app/livechat/server/ajv.ts

@@ -0,0 +1,20 @@
+import { schemas } from '@rocket.chat/core-typings';
+import Ajv from 'ajv';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+	allowUnionTypes: true,
+	code: { source: true },
+});
+
+export { ajv };
+
+const components = schemas.components?.schemas;
+
+if (components) {
+	for (const key in components) {
+		if (Object.prototype.hasOwnProperty.call(components, key)) {
+			ajv.addSchema(components[key], `#/components/schemas/${key}`);
+		}
+	}
+}

apps/meteor/app/livechat/server/index.ts

@@ -1,3 +1,4 @@
+import './ajv';
 import './livechat';
 import './startup';
 import '../lib/messageTypes';

apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts

@@ -1,7 +1,7 @@
 import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { createPredicateFromFilter } from '@rocket.chat/mongo-adapter';
-import type { Filter } from '@rocket.chat/mongo-adapter';
+import type { Filter } from 'mongodb';
 
 import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
 import { RoomManager } from '../../../../client/lib/RoomManager';