fix: 🐛 body overrides headers + multipart not retrying

Author: CodingAleCR

.all-contributorsrc

@@ -143,6 +143,16 @@
         "ideas",
         "code"
       ]
+    },
+    {
+      "login": "vixez",
+      "name": "Glenn Ruysschaert",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3032294?v=4",
+      "profile": "http://www.glennruysschaert.com",
+      "contributions": [
+        "code",
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

CHANGELOG.md

@@ -3,6 +3,8 @@
 ## 2.0.0-beta.2
 
 - 🐞  Fixed: Changing `body` causes that the `headers` also change and ignore previous interceptions (i.e. content-type headers are overriden).
+- 🐞  Fixed: `copyWith` was missing fields
+- 🚦  Tests: Updated tests.
 
 ## 2.0.0-beta.1
 

README.md

@@ -9,7 +9,7 @@
 <!-- prettier-ignore-start -->
 <!-- markdownlint-disable -->
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-13-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <!-- markdownlint-restore -->
 <!-- prettier-ignore-end -->
@@ -300,6 +300,7 @@ Thanks to all the wonderful people contributing to improve this package. Check t
     <td align="center"><a href="https://github.com/Mawi137"><img src="https://avatars.githubusercontent.com/u/5464100?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martijn</b></sub></a><br /><a href="https://github.com/CodingAleCR/http_interceptor/commits?author=Mawi137" title="Tests">⚠️</a> <a href="https://github.com/CodingAleCR/http_interceptor/commits?author=Mawi137" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/MaciejZuk"><img src="https://avatars.githubusercontent.com/u/78476165?v=4?s=100" width="100px;" alt=""/><br /><sub><b>MaciejZuk</b></sub></a><br /><a href="https://github.com/CodingAleCR/http_interceptor/issues?q=author%3AMaciejZuk" title="Bug reports">🐛</a></td>
     <td align="center"><a href="http://lukaskurz.com"><img src="https://avatars.githubusercontent.com/u/22956519?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Lukas Kurz</b></sub></a><br /><a href="https://github.com/CodingAleCR/http_interceptor/commits?author=lukaskurz" title="Tests">⚠️</a> <a href="#ideas-lukaskurz" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/CodingAleCR/http_interceptor/commits?author=lukaskurz" title="Code">💻</a></td>
+    <td align="center"><a href="http://www.glennruysschaert.com"><img src="https://avatars.githubusercontent.com/u/3032294?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Glenn Ruysschaert</b></sub></a><br /><a href="https://github.com/CodingAleCR/http_interceptor/commits?author=vixez" title="Code">💻</a> <a href="https://github.com/CodingAleCR/http_interceptor/commits?author=vixez" title="Tests">⚠️</a></td>
   </tr>
 </table>
 

example/lib/main.dart

@@ -3,8 +3,6 @@ import 'dart:developer';
 import 'dart:io';
 
 import 'package:flutter/material.dart';
-import 'package:http/src/base_request.dart';
-import 'package:http/src/base_response.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 

lib/extensions/multipart_request.dart

@@ -19,9 +19,9 @@ extension MultipartRequestCopyWith on MultipartRequest {
         method?.asString ?? this.method,
         url ?? this.url,
       )
-        ..headers.addAll(headers ?? {})
-        ..fields.addAll(fields ?? {})
-        ..files.addAll(files ?? [])
+        ..headers.addAll(headers ?? this.headers)
+        ..fields.addAll(fields ?? this.fields)
+        ..files.addAll(files ?? this.files)
         ..followRedirects = followRedirects ?? this.followRedirects
         ..maxRedirects = maxRedirects ?? this.maxRedirects
         ..persistentConnection =

lib/extensions/streamed_request.dart

@@ -18,7 +18,7 @@ extension StreamedRequestCopyWith on StreamedRequest {
       method?.asString ?? this.method,
       url ?? this.url,
     )
-      ..headers.addAll(headers ?? {})
+      ..headers.addAll(headers ?? this.headers)
       ..followRedirects = followRedirects ?? this.followRedirects
       ..maxRedirects = maxRedirects ?? this.maxRedirects
       ..persistentConnection =

lib/http/intercepted_client.dart

@@ -205,9 +205,7 @@ class InterceptedClient extends BaseClient {
 
   @override
   Future<StreamedResponse> send(BaseRequest request) async {
-    final interceptedRequest = await _interceptRequest(request);
-
-    final response = await _inner.send(interceptedRequest);
+    final response = await _attemptRequest(request);
 
     final interceptedResponse = await _interceptResponse(response);
 

lib/http/intercepted_http.dart

@@ -2,12 +2,8 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:http/http.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 
-import 'intercepted_client.dart';
-import 'interceptor_contract.dart';
-
 /// Class to be used by the user as a replacement for 'http' with interceptor
 /// support.
 ///

test/extensions/base_reponse_test.dart

@@ -1,4 +1,3 @@
-import 'package:http/http.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:test/test.dart';
 

test/extensions/base_request_test.dart

@@ -1,6 +1,5 @@
 import 'dart:convert';
 
-import 'package:http/http.dart';
 import 'package:http_interceptor/http_interceptor.dart';
 import 'package:test/test.dart';