🐛 fix lejard-h#492 chopper base.dart send() authenticate sending wron…

…g request
techouse · Sep 1, 2023 · 0132492 · 0132492
1 parent e706150
commit 0132492
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/chopper/lib/src/base.dart b/chopper/lib/src/base.dart
@@ -309,11 +309,8 @@ base class ChopperClient {
     dynamic res = Response(response, response.body);
 
     if (authenticator != null) {
-      final Request? updatedRequest = await authenticator!.authenticate(
-        request,
-        res,
-        request,
-      );
+      final Request? updatedRequest =
+          await authenticator!.authenticate(req, res, request);
 
       if (updatedRequest != null) {
         res = await send<BodyType, InnerType>(

diff --git a/chopper/lib/src/interceptor.dart b/chopper/lib/src/interceptor.dart
@@ -193,9 +193,12 @@ class JsonConverter implements Converter, ErrorConverter {
   Request encodeJson(Request request) {
     final String? contentType = request.headers[contentTypeKey];
 
-    return (contentType?.contains(jsonHeaders) ?? false)
-        ? request.copyWith(body: json.encode(request.body))
-        : request;
+    if ((contentType?.contains(jsonHeaders) ?? false) &&
+        (request.body.runtimeType != String || !_isJson(request.body))) {
+      return request.copyWith(body: json.encode(request.body));
+    }
+
+    return request;
   }
 
   FutureOr<Response> decodeJson<BodyType, InnerType>(Response response) async {
@@ -255,6 +258,15 @@ class JsonConverter implements Converter, ErrorConverter {
 
   static Request requestFactory(Request request) =>
       const JsonConverter().convertRequest(request);
+
+  static bool _isJson(dynamic data) {
+    try {
+      json.decode(data);
+      return true;
+    } catch (_) {
+      return false;
+    }
+  }
 }
 
 /// A [Converter] implementation that converts only [Request]s having a [Map] as their body.