..

Author: ggazzo

apps/meteor/app/utils/client/lib/RestApiClient.ts

@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 
 import { baseURI } from '../../../../client/lib/baseURI';
+import { process2faReturn } from '../../../../client/lib/2fa/process2faReturn';
 
 export class RestApiClient extends RestClient {
 	getCredentials():
@@ -26,3 +27,26 @@ export class RestApiClient extends RestClient {
 export const APIClient = new RestApiClient({
 	baseUrl: baseURI.replace(/\/$/, ''),
 });
+
+APIClient.use(function (request, next) {
+	try {
+		return next(...request);
+	} catch (e) {
+		return new Promise((resolve, reject) => {
+			process2faReturn({
+				error: e,
+				result: null,
+				emailOrUsername: undefined,
+				originalCallback: () => reject(e),
+				onCode(code, method) {
+					return resolve(
+						next(request[0], request[1], {
+							...request[2],
+							headers: { ...request[2].headers, 'x-2fa-code': code, 'x-2fa-method': method },
+						}),
+					);
+				},
+			});
+		});
+	}
+});

apps/meteor/client/startup/routes.tsx

@@ -65,7 +65,7 @@ FlowRouter.route('/meet/:rid', {
 	async action(_params, queryParams) {
 		if (queryParams?.token !== undefined) {
 			// visitor login
-			const result = await APIClient.get(`/v1/livechat/visitor/${queryParams.token}`);
+			const result = (await APIClient.get(`/v1/livechat/visitor/${queryParams.token}`)) as ILivechatVisitor;
 
 			if ('visitor' in result) {
 				appLayout.render(<MeetPage />);

apps/meteor/ee/client/ecdh.ts

@@ -65,18 +65,14 @@ async function initEncryptedSession(): Promise<void> {
 }
 
 initEncryptedSession();
+APIClient.use(async (request, next) => {
+	const session = await sessionPromise;
 
-// const _jqueryCall = APIClient._jqueryCall?.bind(APIClient);
-
-// APIClient._jqueryCall = async (method, endpoint, params, body, headers = {}): Promise<any> => {
-// 	const session = await sessionPromise;
-
-// 	if (!session) {
-// 		return _jqueryCall(method, endpoint, params, body, headers);
-// 	}
-
-// 	const result = await _jqueryCall(method, endpoint, params, body, headers, 'text');
-// 	const decrypted = await session.decrypt(result);
-// 	const parsed = JSON.parse(decrypted);
-// 	return parsed;
-// };
+	if (!session) {
+		return next(...request);
+	}
+	const result = await (await next(...request)).text();
+	const decrypted = await session.decrypt(result);
+	const parsed = JSON.parse(decrypted);
+	return parsed;
+});

packages/api-client/src/RestClientInterface.ts

@@ -1,6 +1,10 @@
 import type { Serialized } from '@rocket.chat/core-typings/dist';
 import type { MatchPathPattern, OperationParams, OperationResult, PathFor } from '@rocket.chat/rest-typings';
 
+type Next<T extends (...args: any[]) => any> = (...args: Parameters<T>) => ReturnType<T>;
+
+export type Middleware<T extends (...args: any[]) => any> = (context: Parameters<T>, next: Next<T>) => ReturnType<T>;
+
 // eslint-disable-next-line @typescript-eslint/interface-name-prefix
 export interface RestClientInterface {
 	get<TPath extends PathFor<'GET'>>(
@@ -38,4 +42,8 @@ export interface RestClientInterface {
 		  }
 		| undefined;
 	setCredentials(credentials: undefined | { 'X-User-Id': string; 'X-Auth-Token': string }): void;
+
+	use(middleware: Middleware<RestClientInterface['send']>): void;
+
+	send(endpoint: string, method: string, options: Omit<RequestInit, 'method'>): Promise<Response>;
 }

packages/api-client/src/index.ts

@@ -1,9 +1,14 @@
 import type { Serialized } from '../../core-typings/dist';
 import type { MatchPathPattern, OperationParams, OperationResult, PathFor } from '../../rest-typings/dist';
-import type { RestClientInterface } from './RestClientInterface';
+import type { Middleware, RestClientInterface } from './RestClientInterface';
 
 export { RestClientInterface };
 
+const pipe =
+	<T extends (...args: any[]) => any>(fn: T) =>
+	(...args: Parameters<T>): ReturnType<T> =>
+		fn(...args);
+
 export class RestClient implements RestClientInterface {
 	private readonly baseUrl: string;
 
@@ -61,7 +66,9 @@ export class RestClient implements RestClientInterface {
 			: Record<string, string>,
 		options?: Omit<RequestInit, 'method'>,
 	): Promise<TPath extends PathFor<'GET'> ? Serialized<OperationResult<'GET', MatchPathPattern<TPath>>> : unknown> {
-		return this.send(`${endpoint}?${this.getParams(params)}`, 'GET', options);
+		return this.send(`${endpoint}?${this.getParams(params)}`, 'GET', options).then(function (response) {
+			return response.json();
+		});
 	}
 
 	post: RestClientInterface['post'] = (endpoint, params, { headers, ...options } = {}) => {
@@ -75,6 +82,8 @@ export class RestClient implements RestClientInterface {
 			},
 
 			...options,
+		}).then(function (response) {
+			return response.json();
 		});
 	};
 
@@ -89,11 +98,15 @@ export class RestClient implements RestClientInterface {
 			},
 
 			...options,
+		}).then(function (response) {
+			return response.json();
 		});
 	};
 
 	delete: RestClientInterface['delete'] = (endpoint, params, options) => {
-		return this.send(endpoint, 'DELETE', options);
+		return this.send(endpoint, 'DELETE', options).then(function (response) {
+			return response.json();
+		});
 	};
 
 	protected getCredentialsAsHeaders(): Record<string, string> {
@@ -106,14 +119,12 @@ export class RestClient implements RestClientInterface {
 			: {};
 	}
 
-	protected send<T>(endpoint: string, method: string, { headers, ...options }: Omit<RequestInit, 'method'> = {}): Promise<T> {
+	send(endpoint: string, method: string, { headers, ...options }: Omit<RequestInit, 'method'> = {}): Promise<Response> {
 		return fetch(`${this.baseUrl}${endpoint}`, {
 			...options,
 			headers: { ...this.getCredentialsAsHeaders(), ...this.headers, ...headers },
 			method,
-		}).then(function (response) {
-			return response.json();
-		}) as Promise<T>;
+		});
 	}
 
 	protected getParams(data: Record<string, object | number | string | boolean> | void): string {
@@ -127,4 +138,10 @@ export class RestClient implements RestClientInterface {
 					.join('&')
 			: '';
 	}
+
+	use(middleware: Middleware<RestClientInterface['send']>): void {
+		this.send = function (this: RestClient, ...context: Parameters<RestClientInterface['send']>): ReturnType<RestClientInterface['send']> {
+			return middleware(context, pipe(this.send.bind(this)));
+		} as RestClientInterface['send'];
+	}
 }