From 9aaba746ddd0bd8355514764b82ad5a387e9e8ad Mon Sep 17 00:00:00 2001 From: LaberionAjvazi Date: Mon, 12 Feb 2024 15:47:16 +0100 Subject: [PATCH 1/3] [TA-2856] Reject from data on export packages error --- src/services/http-client-service.v2.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/services/http-client-service.v2.ts b/src/services/http-client-service.v2.ts index 12c3865..5107d49 100644 --- a/src/services/http-client-service.v2.ts +++ b/src/services/http-client-service.v2.ts @@ -26,18 +26,19 @@ class HttpClientServiceV2 { return new Promise((resolve, reject) => { axios.get(this.resolveUrl(url), { headers: this.buildHeaders(contextService.getContext().profile), - responseType: "stream" + responseType: "stream", + validateStatus: status => status >= 200 }).then(response => { const data: Buffer[] = []; response.data.on("data", (chunk: Buffer) => { data.push(chunk); }); response.data.on("end", () => { - if (this.checkBadRequest(response.status)) { - this.handleBadRequest(response.status, response.data, reject); - } else { - this.handleResponseStreamData(Buffer.concat(data), resolve, reject); + if (response.status !== 200) { + reject(Buffer.concat(data).toString()); } + + this.handleResponseStreamData(Buffer.concat(data), resolve, reject); }); }).catch(err => { this.handleError(err, resolve, reject); From c50d2391d4e0f00881a0560ef63eb82668631635 Mon Sep 17 00:00:00 2001 From: LaberionAjvazi Date: Mon, 12 Feb 2024 15:53:54 +0100 Subject: [PATCH 2/3] [TA-2856] Fix tests --- tests/utls/http-requests-mock.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/utls/http-requests-mock.ts b/tests/utls/http-requests-mock.ts index 8da4a7f..eee2543 100644 --- a/tests/utls/http-requests-mock.ts +++ b/tests/utls/http-requests-mock.ts @@ -17,6 +17,7 @@ const mockAxiosGet = (url: string, responseData: any) => { readableStream.push(response.data) readableStream.push(null); return Promise.resolve({ + status: 200, data: readableStream, }); } else { From 45af8f47b2033af11e33552392920361667daeaa Mon Sep 17 00:00:00 2001 From: LaberionAjvazi Date: Wed, 14 Feb 2024 15:05:04 +0100 Subject: [PATCH 3/3] [TA-2856] Add return statement --- src/services/http-client-service.v2.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/services/http-client-service.v2.ts b/src/services/http-client-service.v2.ts index 5107d49..70f0621 100644 --- a/src/services/http-client-service.v2.ts +++ b/src/services/http-client-service.v2.ts @@ -36,6 +36,7 @@ class HttpClientServiceV2 { response.data.on("end", () => { if (response.status !== 200) { reject(Buffer.concat(data).toString()); + return; } this.handleResponseStreamData(Buffer.concat(data), resolve, reject);