Merge pull request #1050 from appwrite/fix-already-read

fix: appwrite exception already read

Author: stnguyen90

templates/node/src/client.ts.twig

@@ -263,7 +263,6 @@ class Client {
         const { uri, options } = this.prepareRequest(method, url, headers, params);
 
         let data: any = null;
-        let text: string = '';
 
         const response = await fetch(uri, options);
 
@@ -274,18 +273,22 @@ class Client {
 
         if (response.headers.get('content-type')?.includes('application/json')) {
             data = await response.json();
-            text = JSON.stringify(data);
         } else if (responseType === 'arrayBuffer') {
             data = await response.arrayBuffer();
         } else {
-            text = await response.text();
             data = {
-                message: text
+                message: await response.text()
             };
         }
 
         if (400 <= response.status) {
-            throw new {{spec.title | caseUcfirst}}Exception(data?.message, response.status, data?.type, text);
+            let responseText = '';
+            if (response.headers.get('content-type')?.includes('application/json') || responseType === 'arrayBuffer') {
+                responseText = JSON.stringify(data);
+            } else {
+                responseText = data?.message;
+            }
+            throw new {{spec.title | caseUcfirst}}Exception(data?.message, response.status, data?.type, responseText);
         }
 
         return data;

templates/react-native/src/client.ts.twig

@@ -414,8 +414,8 @@ class Client {
 
         try {
             let data = null;
+
             const response = await fetch(url.toString(), options);
-            const text = await response.text()
 
             const warnings = response.headers.get('x-{{ spec.title | lower }}-warning');
             if (warnings) {
@@ -426,12 +426,18 @@ class Client {
                 data = await response.json();
             } else {
                 data = {
-                    message: text
+                    message: await response.text()
                 };
             }
 
             if (400 <= response.status) {
-                throw new {{spec.title | caseUcfirst}}Exception(data?.message, response.status, data?.type, text);
+                let responseText = '';
+                if (response.headers.get('content-type')?.includes('application/json') || responseType === 'arrayBuffer') {
+                    responseText = JSON.stringify(data);
+                } else {
+                    responseText = data?.message;
+                }
+                throw new {{spec.title | caseUcfirst}}Exception(data?.message, response.status, data?.type, responseText);
             }
 
             const cookieFallback = response.headers.get('X-Fallback-Cookies');

templates/web/src/client.ts.twig

@@ -669,7 +669,6 @@ class Client {
         const { uri, options } = this.prepareRequest(method, url, headers, params);
 
         let data: any = null;
-        let text: string = '';
 
         const response = await fetch(uri, options);
 
@@ -680,18 +679,22 @@ class Client {
 
         if (response.headers.get('content-type')?.includes('application/json')) {
             data = await response.json();
-            text = JSON.stringify(data);
         } else if (responseType === 'arrayBuffer') {
             data = await response.arrayBuffer();
         } else {
-            text = await response.text();
             data = {
-                message: text
+                message: await response.text()
             };
         }
 
         if (400 <= response.status) {
-            throw new {{spec.title | caseUcfirst}}Exception(data?.message, response.status, data?.type, text);
+            let responseText = '';
+            if (response.headers.get('content-type')?.includes('application/json') || responseType === 'arrayBuffer') {
+                responseText = JSON.stringify(data);
+            } else {
+                responseText = data?.message;
+            }
+            throw new {{spec.title | caseUcfirst}}Exception(data?.message, response.status, data?.type, responseText);
         }
 
         const cookieFallback = response.headers.get('X-Fallback-Cookies');