Fix Review

RocketChat · Jun 16, 2022 · 4cdfa42 · 4cdfa42
1 parent fbf7fbe
commit 4cdfa42
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/apps/meteor/app/utils/client/lib/RestApiClient.ts b/apps/meteor/app/utils/client/lib/RestApiClient.ts
@@ -30,13 +30,14 @@ export const APIClient = new RestApiClient({
 
 APIClient.use(async function (request, next) {
 	try {
-		const res = await next(...request);
-		if (!res.ok) {
-			throw await res.json();
+		return await next(...request);
+	} catch (error) {
+		if (!(error instanceof Response) || error.status !== 400) {
+			throw error;
 		}
-		return res;
-	} catch (e) {
-		return new Promise((resolve, reject) => {
+
+		return new Promise(async (resolve, reject) => {
+			const e = await error.json();
 			process2faReturn({
 				error: e,
 				result: null,

diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
@@ -161,6 +161,11 @@ export class RestClient implements RestClientInterface {
 			...options,
 			headers: { ...this.getCredentialsAsHeaders(), ...this.headers, ...headers },
 			method,
+		}).then(function (response) {
+			if (!response.ok) {
+				return Promise.reject(response);
+			}
+			return response;
 		});
 	}