fix(client): Throw a ClientException on non-json responses, to be

consistent with other malformed responses. Fix tests to also expect a ClientException in theses cases. Fixes #552.
zino-hofmann · Jan 31, 2020 · 7d538e1 · 7d538e1
1 parent 39c640f
commit 7d538e1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/graphql/lib/src/link/http/link_http.dart b/packages/graphql/lib/src/link/http/link_http.dart
@@ -318,8 +318,12 @@ Future<FetchResult> _parseResponse(StreamedResponse response) async {
   final Uint8List responseByte = await response.stream.toBytes();
   final String decodedBody = encoding.decode(responseByte);
 
-  final Map<String, dynamic> jsonResponse =
-      json.decode(decodedBody) as Map<String, dynamic>;
+  Map<String, dynamic> jsonResponse;
+  try {
+      jsonResponse=  json.decode(decodedBody) as Map<String, dynamic>;
+  }catch(e){
+    throw ClientException('Invalid response body: $decodedBody');
+  }
   final FetchResult fetchResult = FetchResult();
 
   if (jsonResponse['errors'] != null) {

diff --git a/packages/graphql/test/link/http/link_http_test.dart b/packages/graphql/test/link/http/link_http_test.dart
@@ -453,12 +453,12 @@ void main() {
 
       expect(
         exception,
-        const TypeMatcher<UnhandledFailureWrapper>(),
+        const TypeMatcher<ClientException>(),
       );
 
       expect(
-        (exception as UnhandledFailureWrapper).failure,
-        const TypeMatcher<FormatException>(),
+        (exception as ClientException).message,
+        "Invalid response body: ",
       );
     });