Merge pull request #166 from lohanidamodar/fix-exceptions-when-response-non-json

fix-exceptions-when-response-non-json

Author: eldadfux

templates/deno/src/client.ts.twig

@@ -93,15 +93,20 @@ export class Client {
             let response = await fetch(url.toString(), options);
             const contentType = response.headers.get('content-type');
 
-            if(response.status >= 400) {
-                let res = await response.json();
-                throw new {{ spec.title | caseUcfirst}}Exception(res.message, res.status, res);
-            }
-
             if (contentType && contentType.includes('application/json')) {
+                if(response.status >= 400) {
+                    let res = await response.json();
+                    throw new {{ spec.title | caseUcfirst}}Exception(res.message, res.status, res);
+                }
+
                 return response.json()
+            } else {
+                if(response.status >= 400) {
+                    let res = await response.text();
+                    throw new {{ spec.title | caseUcfirst}}Exception(res, response.status, null);
+                }
+                return response;
             }
-            return response;
         } catch(error) {
             throw new {{ spec.title | caseUcfirst}}Exception(error?.response?.message || error.message, error?.response?.code, error.response);
         }

templates/node/lib/client.js.twig

@@ -109,8 +109,12 @@ class Client {
             return response.data;
         } catch(error) {
             if('response' in error) {
-                if('data' in error.response) {
-                    throw new {{spec.title | caseUcfirst}}Exception(error.response.data.message, error.response.status, error.response.data);
+                if(error.response && 'data' in error.response) {
+                    if (typeof(error.response.data) === 'string') {
+                        throw new {{spec.title | caseUcfirst}}Exception(error.response.data, error.response.status, error.response.data);   
+                    } else {
+                        throw new {{spec.title | caseUcfirst}}Exception(error.response.data.message, error.response.status, error.response.data);
+                    }
                 }else{
                     throw new {{spec.title | caseUcfirst}}Exception(error.response.statusText, error.response.status, error.response.data);
                 }

templates/php/src/Client.php.twig

@@ -187,7 +187,11 @@ class Client
         curl_close($ch);
 
         if($responseStatus >= 400) {
-            throw new {{spec.title | caseUcfirst}}Exception($responseBody['message'], $responseStatus, $responseBody);
+            if(is_array($responseBody)) {
+                throw new {{spec.title | caseUcfirst}}Exception($responseBody['message'], $responseStatus, $responseBody);
+            } else {
+                throw new {{spec.title | caseUcfirst}}Exception($responseBody, $responseStatus);
+            }
         }
 
 

templates/python/package/client.py.twig

@@ -86,8 +86,12 @@ class Client:
 
             return response._content
         except Exception as e:
-            if response.json():
-                raise {{spec.title | caseUcfirst}}Exception(response.json()['message'], response.status_code, response.json())
+            if response != None:
+                content_type = response.headers['Content-Type']
+                if content_type.startswith('application/json'):
+                    raise {{spec.title | caseUcfirst}}Exception(response.json()['message'], response.status_code, response.json())
+                else:
+                    raise {{spec.title | caseUcfirst}}Exception(response.text, response.status_code)
             else:
                 raise {{spec.title | caseUcfirst}}Exception(e)
 

templates/ruby/lib/container/client.rb.twig

@@ -93,8 +93,12 @@ module {{spec.title | caseUcfirst}}
 
                 return fetch(method, uri, headers, {}, limit - 1)
             end
-
-            res = JSON.parse(response.body);
+            
+            begin
+                res = JSON.parse(response.body);
+            rescue JSON::ParserError => e
+                raise {{spec.title | caseUcfirst}}::Exception.new(response.body, response.code, nil)
+            end
 
             if(response.code.to_i >= 400)
                 raise {{spec.title | caseUcfirst}}::Exception.new(res['message'], res['status'], res)

tests/SDKTest.php

@@ -328,6 +328,7 @@ public function testHTTPSuccess()
                 if ($options['supportException']) {
                     $this->assertEquals('Mock 400 error',$output[12] ?? '');
                     $this->assertEquals('Server Error', $output[13] ?? '');
+                    $this->assertEquals('This is a text error', $output[14] ?? '');
                 }
             }
         }

tests/languages/dart/tests.dart

@@ -66,6 +66,12 @@ void main() async {
     print(e.message);
   }
 
+  try {
+    await general.error502();
+  } on AppwriteException catch(e) {
+    print(e.message);
+  }
+
   // response = await general.setCookie();
   // print(response.data['result']);
 

tests/languages/deno/tests.ts

@@ -85,6 +85,12 @@ async function start() {
   }catch(error){
     console.log(error.message);
   }
+
+  try {
+    response = await general.error502();
+  }catch(error){
+    console.log(error.message);
+  }
 }
 
 start()

tests/languages/flutter/tests.dart

@@ -69,6 +69,12 @@ void main() async {
     print(e.message);
   }
 
+  try {
+    await general.error502();
+  } on AppwriteException catch (e) {
+    print(e.message);
+  }
+
   // response = await general.setCookie();
   // print(response.data['result']);
 

tests/languages/node/test.js

@@ -61,11 +61,18 @@ async function start() {
     } catch(error) {
         console.log(error.message);
     }
+    
     try {
         response = await general.error500();
     } catch(error) {
         console.log(error.message);
     }
+    
+    try {
+        response = await general.error502();
+    } catch(error) {
+        console.log(error.message);
+    }
 
 }