From ce04f77e75338731eb355910606e013cbb939d33 Mon Sep 17 00:00:00 2001 From: Yin Yue Date: Mon, 15 Apr 2024 13:55:45 +0530 Subject: [PATCH 1/4] SCAL-183953 Wrong Error Msg --- src/index.ts | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/src/index.ts b/src/index.ts index dc6e0fa..b172fe4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -180,17 +180,25 @@ export function rise( .then(async (response) => { if (!response.ok) { let payload; - try { - const contentType = response.headers.get('Content-Type'); - const isTextContent = contentType && contentType.includes('text'); - if (isTextContent) { - payload = { [errorroot]: { message: await response.text() } }; - } else { - payload = await response.json(); + try{ + const contentType = response.headers.get('Content-Type'); + const isJsonContent = contentType && contentType.includes('application/json'); + const isTextContent = contentType && contentType.includes('text'); + if (isJsonContent) { + try { + payload = await response.json(); + } catch (jsonError) { + payload = { error: "Received unparsable JSON response from the server." }; + } + } else if (isTextContent) { + const textResponse = await response.text(); + payload = { error: textResponse || "No error message provided by the server." }; + } else { + payload = { error: "Unsupported content type in server response." }; + } + } catch (e : any) { + throw new options.ErrorClass(response.statusText, response.status, e); } - } catch (e) { - throw new options.ErrorClass(response.statusText, response.status, e); - } const error = (errorroot ? _.get(payload, errorroot) : payload) || {}; throw new options.ErrorClass(response.statusText, response.status, error); } From 9927441d14a9d304a4d70ec6c0dc2f71248cb0c2 Mon Sep 17 00:00:00 2001 From: Yin Yue Date: Mon, 15 Apr 2024 14:03:44 +0530 Subject: [PATCH 2/4] SCAL-183953 Wrong Error Msg --- src/index.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index b172fe4..1650121 100644 --- a/src/index.ts +++ b/src/index.ts @@ -180,7 +180,7 @@ export function rise( .then(async (response) => { if (!response.ok) { let payload; - try{ + try { const contentType = response.headers.get('Content-Type'); const isJsonContent = contentType && contentType.includes('application/json'); const isTextContent = contentType && contentType.includes('text'); @@ -188,13 +188,13 @@ export function rise( try { payload = await response.json(); } catch (jsonError) { - payload = { error: "Received unparsable JSON response from the server." }; + payload = { error: 'Received unparsable JSON response from the server.' }; } } else if (isTextContent) { const textResponse = await response.text(); - payload = { error: textResponse || "No error message provided by the server." }; + payload = { error: textResponse || 'No error message provided by the server.' }; } else { - payload = { error: "Unsupported content type in server response." }; + payload = { error: 'Unsupported content type in server response.' }; } } catch (e : any) { throw new options.ErrorClass(response.statusText, response.status, e); From 0a99a649299860c23314998632011b733d535b54 Mon Sep 17 00:00:00 2001 From: Yin Yue Date: Mon, 15 Apr 2024 14:14:37 +0530 Subject: [PATCH 3/4] SCAL-183953 Test Case Failure --- src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index 1650121..d04b8e4 100644 --- a/src/index.ts +++ b/src/index.ts @@ -188,13 +188,13 @@ export function rise( try { payload = await response.json(); } catch (jsonError) { - payload = { error: 'Received unparsable JSON response from the server.' }; + payload = { message: 'Received unparsable JSON response from the server.' }; } } else if (isTextContent) { const textResponse = await response.text(); - payload = { error: textResponse || 'No error message provided by the server.' }; + payload = { message: textResponse || 'No error message provided by the server.' }; } else { - payload = { error: 'Unsupported content type in server response.' }; + payload = { message: 'Unsupported content type in server response.' }; } } catch (e : any) { throw new options.ErrorClass(response.statusText, response.status, e); From e628076dbd1667d7f5ba03ddfd5c289d27c247b3 Mon Sep 17 00:00:00 2001 From: Yin Yue Date: Mon, 15 Apr 2024 14:23:26 +0530 Subject: [PATCH 4/4] SCAL-183953 Test Case Failure --- src/index.ts | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/src/index.ts b/src/index.ts index d04b8e4..fc9dfd5 100644 --- a/src/index.ts +++ b/src/index.ts @@ -181,24 +181,23 @@ export function rise( if (!response.ok) { let payload; try { - const contentType = response.headers.get('Content-Type'); - const isJsonContent = contentType && contentType.includes('application/json'); - const isTextContent = contentType && contentType.includes('text'); - if (isJsonContent) { - try { - payload = await response.json(); - } catch (jsonError) { - payload = { message: 'Received unparsable JSON response from the server.' }; - } - } else if (isTextContent) { - const textResponse = await response.text(); - payload = { message: textResponse || 'No error message provided by the server.' }; - } else { - payload = { message: 'Unsupported content type in server response.' }; + const contentType = response.headers.get('Content-Type'); + const isJsonContent = contentType && contentType.includes('application/json'); + const isTextContent = contentType && contentType.includes('text'); + if (isJsonContent) { + try { + payload = await response.json(); + } catch (jsonError) { + payload = { [errorroot]: { message: 'Received unparsable JSON response from the server.' } }; } - } catch (e : any) { - throw new options.ErrorClass(response.statusText, response.status, e); + } else if (isTextContent) { + payload = { [errorroot]: { message: await response.text() } }; + } else { + payload = { [errorroot]: { message: 'Unsupported content type in server response.' } }; } + } catch (e) { + throw new options.ErrorClass(response.statusText, response.status, e); + } const error = (errorroot ? _.get(payload, errorroot) : payload) || {}; throw new options.ErrorClass(response.statusText, response.status, error); }