Merge branch 'ctedgar-fix-unable-to-overwrite-request-headers-reprodu…

…cer' into minor

just_audio/CHANGELOG.md

@@ -3,6 +3,7 @@
 * Add setAllowsExternalPlayback on iOS/macOS.
 * Support index-based seeking on Android/iOS/macOS.
 * Add option to send headers/userAgent without proxy.
+* Fix bug where user supplied headers are overwritten by defaults (@ctedgar).
 
 ## 0.9.35
 

just_audio/lib/just_audio.dart

@@ -3277,9 +3277,11 @@ _ProxyHandler _proxyHandlerForUri(
     // Try to make normal request
     String? host;
     try {
-      final requestHeaders = <String, String>{if (headers != null) ...headers};
+      final requestHeaders = <String, String>{};
       request.headers
           .forEach((name, value) => requestHeaders[name] = value.join(', '));
+      // write supplied headers last (to ensure supplied headers aren't overwritten)
+      headers?.forEach((name, value) => requestHeaders[name] = value);
       final originRequest =
           await _getUrl(client, redirectedUri ?? uri, headers: requestHeaders);
       host = originRequest.headers.value(HttpHeaders.hostHeader);

just_audio/test/just_audio_test.dart

@@ -397,9 +397,13 @@ void runTests() {
     await server.start();
     final player = AudioPlayer();
     // This simulates an actual URL
+    var headers = {
+      'custom-header': 'Hello',
+      'accept-encoding': 'custom-encoding',
+    };
     final uri = Uri.parse(
         'http://${InternetAddress.loopbackIPv4.address}:${server.port}/proxy/foo.mp3');
-    await player.setUrl('$uri', headers: {'custom-header': 'Hello'});
+    await player.setUrl('$uri', headers: headers);
     // Obtain the proxy URL that the platform side should use to load the data.
     final proxyUri = Uri.parse(player.icyMetadata!.info!.url!);
     // Simulate the platform side requesting the data.
@@ -410,6 +414,10 @@ void runTests() {
     expect(responseText, equals('Hello'));
     expect(response.headers.value(HttpHeaders.contentTypeHeader),
         equals('audio/mock'));
+    // MockWebServer returns original request headers in response headers
+    // (with 'original_' prepended)
+    headers.forEach(
+        (key, value) => expect(response.headers.value('original_$key'), value));
     await server.stop();
     await player.dispose();
   });
@@ -1764,6 +1772,8 @@ class MockWebServer {
         response.contentLength = body.length;
         response.statusCode = HttpStatus.ok;
         response.headers.set(HttpHeaders.contentTypeHeader, 'audio/mock');
+        request.headers.forEach(
+            (name, value) => response.headers.set('original_$name', value));
         response.add(body);
         await response.flush();
         await response.close();