Preventing "charset" from being added

Preventing charset from being added to the "content-type" header. Based
on a workaround for a know http bug:
dart-lang/http#184 (comment).

Author: maporcho

example/pubspec.lock

@@ -7,7 +7,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -21,14 +21,14 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -42,14 +42,14 @@ packages:
       name: collection
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   ffi:
     dependency: transitive
     description:
@@ -106,28 +106,35 @@ packages:
       name: js
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   path_provider_linux:
     dependency: transitive
     description:
@@ -230,7 +237,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -265,7 +272,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.9"
   typed_data:
     dependency: transitive
     description:
@@ -279,7 +286,7 @@ packages:
       name: vector_math
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   win32:
     dependency: transitive
     description:
@@ -295,5 +302,5 @@ packages:
     source: hosted
     version: "0.2.0"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
+  dart: ">=2.17.0-0 <3.0.0"
   flutter: ">=2.0.0"

lib/http/intercepted_client.dart

@@ -34,6 +34,9 @@ import 'interceptor_contract.dart';
 ///the connection alive with the server.
 ///
 ///Note: `send` method is not currently supported.
+///
+enum BodyType { string, list, map }
+
 class InterceptedClient extends BaseClient {
   List<InterceptorContract> interceptors;
   Duration? requestTimeout;
@@ -197,22 +200,27 @@ class InterceptedClient extends BaseClient {
   }) async {
     url = url.addParameters(params);
 
+    late BodyType bodyType;
+
     Request request = new Request(methodToString(method), url);
     if (headers != null) request.headers.addAll(headers);
     if (encoding != null) request.encoding = encoding;
     if (body != null) {
       if (body is String) {
+        bodyType = BodyType.string;
         request.body = body;
       } else if (body is List) {
+        bodyType = BodyType.list;
         request.bodyBytes = body.cast<int>();
       } else if (body is Map) {
+        bodyType = BodyType.map;
         request.bodyFields = body.cast<String, String>();
       } else {
         throw new ArgumentError('Invalid request body "$body".');
       }
     }
 
-    var response = await _attemptRequest(request);
+    var response = await _attemptRequest(request, bodyType);
 
     // Intercept response
     response = await _interceptResponse(response);
@@ -231,11 +239,11 @@ class InterceptedClient extends BaseClient {
 
   /// Attempts to perform the request and intercept the data
   /// of the response
-  Future<Response> _attemptRequest(Request request) async {
+  Future<Response> _attemptRequest(Request request, BodyType bodyType) async {
     var response;
     try {
       // Intercept request
-      final interceptedRequest = await _interceptRequest(request);
+      final interceptedRequest = await _interceptRequest(request, bodyType);
 
       var stream = requestTimeout == null
           ? await send(interceptedRequest)
@@ -247,14 +255,14 @@ class InterceptedClient extends BaseClient {
           await retryPolicy!.shouldAttemptRetryOnResponse(
               ResponseData.fromHttpResponse(response))) {
         _retryCount += 1;
-        return _attemptRequest(request);
+        return _attemptRequest(request, bodyType);
       }
     } on Exception catch (error) {
       if (retryPolicy != null &&
           retryPolicy!.maxRetryAttempts > _retryCount &&
           retryPolicy!.shouldAttemptRetryOnException(error)) {
         _retryCount += 1;
-        return _attemptRequest(request);
+        return _attemptRequest(request, bodyType);
       } else {
         rethrow;
       }
@@ -265,10 +273,10 @@ class InterceptedClient extends BaseClient {
   }
 
   /// This internal function intercepts the request.
-  Future<Request> _interceptRequest(Request request) async {
+  Future<Request> _interceptRequest(Request request, BodyType bodyType) async {
     for (InterceptorContract interceptor in interceptors) {
       RequestData interceptedData = await interceptor.interceptRequest(
-        data: RequestData.fromHttpRequest(request),
+        data: RequestData.fromHttpRequest(request, bodyType),
       );
       request = interceptedData.toHttpRequest();
     }

lib/models/request_data.dart

@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'dart:typed_data';
 import 'package:http/http.dart';
 
 import 'package:http_interceptor/extensions/extensions.dart';
@@ -26,6 +27,10 @@ class RequestData {
 
   dynamic body;
 
+  Uint8List? bodyBytes;
+
+  Map<String, String>? bodyFields;
+
   /// The encoding used for the request.
   Encoding? encoding;
 
@@ -34,8 +39,10 @@ class RequestData {
     required this.baseUrl,
     Map<String, String>? headers,
     Map<String, dynamic>? params,
-    this.body,
     this.encoding,
+    this.body,
+    this.bodyBytes,
+    this.bodyFields,
   })  : headers = headers ?? {},
         params = params ?? {};
 
@@ -47,22 +54,36 @@ class RequestData {
   ///
   /// For now it only supports [Request].
   /// TODO(codingalecr): Support for [MultipartRequest] and [StreamedRequest].
-  factory RequestData.fromHttpRequest(BaseRequest request) {
+  factory RequestData.fromHttpRequest(BaseRequest request,
+      [BodyType bodyType = BodyType.string]) {
     var params = Map<String, dynamic>();
     request.url.queryParametersAll.forEach((key, value) {
       params[key] = value;
     });
     String baseUrl = request.url.origin + request.url.path;
 
     if (request is Request) {
-      return RequestData(
+      final requestData = RequestData(
         method: methodFromString(request.method),
         baseUrl: baseUrl,
         headers: request.headers,
-        body: request.body,
         encoding: request.encoding,
         params: params,
       );
+
+      switch (bodyType) {
+        case BodyType.string:
+          requestData.body = request.body;
+          break;
+        case BodyType.list:
+          requestData.bodyBytes = request.bodyBytes;
+          break;
+        case BodyType.map:
+          requestData.bodyFields = request.bodyFields;
+          break;
+      }
+
+      return requestData;
     }
 
     throw UnsupportedError(
@@ -76,20 +97,21 @@ class RequestData {
 
     Request request = new Request(methodToString(method), reqUrl.toUri());
 
-    request.headers.addAll(headers);
     if (encoding != null) request.encoding = encoding!;
     if (body != null) {
       if (body is String) {
         request.body = body as String;
       } else if (body is List) {
-        request.bodyBytes = body?.cast<int>();
+        request.bodyBytes = bodyBytes!;
       } else if (body is Map) {
-        request.bodyFields = body.cast<String, String>();
+        request.bodyFields = bodyFields!;
       } else {
         throw new ArgumentError('Invalid request body "$body".');
       }
     }
 
+    request.headers.addAll(headers);
+
     return request;
   }