Merge branch 'master' into feat-dart-sdk-null-safety

Author: lohanidamodar

templates/dart/lib/client.dart.twig

@@ -96,7 +96,15 @@ class Client {
           if(e.response == null) {
             throw {{spec.title | caseUcfirst}}Exception(e.message);
           }
-          throw {{spec.title | caseUcfirst}}Exception(e.response!.data['message'],e.response!.data['code'], e.response!.data);
+          if(responseType == ResponseType.bytes) {
+            if(e.response!.headers['content-type'].contains('application/json')) {
+              final res = json.decode(utf8.decode(e.response!.data));
+              throw {{spec.title | caseUcfirst}}Exception(res['message'],res['code'], res);
+            } else {
+              throw {{spec.title | caseUcfirst}}Exception(e.message);
+            }
+          }
+          throw {{spec.title | caseUcfirst}}Exception(e.response.data['message'],e.response.data['code'], e.response.data);
         } catch(e) {
           throw {{spec.title | caseUcfirst}}Exception(e.toString());
         }

templates/dart/lib/package.dart.twig

@@ -1,6 +1,7 @@
 library {{ language.params.packageName }};
 
 import 'dart:io';
+import 'dart:convert';
 import 'package:dio/dio.dart';
 import 'package:meta/meta.dart';
 import 'package:dio/adapter.dart';

templates/flutter/lib/client.dart.twig

@@ -127,6 +127,14 @@ class Client {
           if(e.response == null) {
             throw {{spec.title | caseUcfirst}}Exception(e.message);
           }
+          if(responseType == ResponseType.bytes) {
+            if(e.response.headers['content-type'].contains('application/json')) {
+              final res = json.decode(utf8.decode(e.response.data));
+              throw {{spec.title | caseUcfirst}}Exception(res['message'],res['code'], e.response);
+            } else {
+              throw {{spec.title | caseUcfirst}}Exception(e.message);
+            }
+          }
           throw {{spec.title | caseUcfirst}}Exception(e.response.data['message'],e.response.data['code'], e.response.data);
         } catch(e) {
           throw {{spec.title | caseUcfirst}}Exception(e.message);

templates/flutter/lib/package.dart.twig

@@ -1,6 +1,7 @@
 library {{ language.params.packageName }};
 
 import 'dart:io';
+import 'dart:convert';
 import 'package:universal_html/html.dart' as html;
 import 'package:dio/dio.dart';
 import 'package:meta/meta.dart';