Parse error responses as text first

stellar · Apr 15, 2020 · 9fe355d · 9fe355d
1 parent d6b5809
commit 9fe355d
Showing 1 changed file with 20 additions and 12 deletions.
diff --git a/src/transfers/TransferProvider.ts b/src/transfers/TransferProvider.ts
@@ -120,15 +120,17 @@ export abstract class TransferProvider {
     );
 
     if (!response.ok) {
+      const badResponse = await response.text();
       try {
-        const { error } = await response.json();
+        const { error, message } = JSON.parse(badResponse);
         throw new Error(
-          `Error fetching info from ${this.transferServer}: error ${error}`,
+          `Error fetching info from ${this.transferServer}: error ${error ||
+            message}`,
         );
       } catch (e) {
         throw new Error(
           `Error fetching info from ${this.transferServer}: error 
-          code ${response.status}, status text: "${response.statusText}"`,
+          code ${response.status}, response text: "${badResponse}"`,
         );
       }
     }
@@ -206,17 +208,18 @@ export abstract class TransferProvider {
     );
 
     if (!response.ok) {
+      const badResponse = await response.text();
       try {
-        const { error } = await response.json();
+        const { error, message } = JSON.parse(badResponse);
         throw new Error(
           `Error fetching transactions from ${
             this.transferServer
-          }: error ${error}`,
+          }: error ${error || message}`,
         );
       } catch (e) {
         throw new Error(
           `Error fetching transactions from ${this.transferServer}: error 
-          code ${response.status}, status text: "${response.statusText}"`,
+          code ${response.status}, response text: "${badResponse}"`,
         );
       }
     }
@@ -282,17 +285,19 @@ export abstract class TransferProvider {
     );
 
     if (!response.ok) {
+      const badResponse = await response.text();
+
       try {
-        const { error } = await response.json();
+        const { error, message } = JSON.parse(badResponse);
         throw new Error(
           `Error fetching transaction ${qs} from ${
             this.transferServer
-          }: error ${error}`,
+          }: error ${error || message}`,
         );
       } catch (e) {
         throw new Error(
           `Error fetching transaction ${qs} from ${this.transferServer}: error 
-          code ${response.status}, status text: "${response.statusText}"`,
+          code ${response.status}, response text: "${badResponse}"`,
         );
       }
     }
@@ -637,15 +642,18 @@ export abstract class TransferProvider {
         );
 
         if (!response.ok) {
+          const badResponse = await response.text();
+
           try {
-            const { error } = await response.json();
+            const { error, message } = JSON.parse(badResponse);
             throw new Error(
-              `Error fetching fees from ${this.transferServer}: error ${error}`,
+              `Error fetching fees from ${this.transferServer}: error ${error ||
+                message}`,
             );
           } catch (e) {
             throw new Error(
               `Error fetching fees from ${this.transferServer}: error 
-              code ${response.status}, status text: "${response.statusText}"`,
+              code ${response.status}, response text: "${badResponse}"`,
             );
           }
         }