Let HttpNetworkTransport handle the Accept header

Author: BoD

libraries/apollo-api/api/apollo-api.api

@@ -934,8 +934,6 @@ public final class com/apollographql/apollo/api/http/ByteStringHttpBody : com/ap
 public final class com/apollographql/apollo/api/http/DefaultHttpRequestComposer : com/apollographql/apollo/api/http/HttpRequestComposer {
 	public static final field Companion Lcom/apollographql/apollo/api/http/DefaultHttpRequestComposer$Companion;
 	public fun <init> (Ljava/lang/String;)V
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
-	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun compose (Lcom/apollographql/apollo/api/ApolloRequest;)Lcom/apollographql/apollo/api/http/HttpRequest;
 }
 

libraries/apollo-api/api/apollo-api.klib.api

@@ -493,7 +493,6 @@ final class com.apollographql.apollo.api.http/ByteStringHttpBody : com.apollogra
 
 final class com.apollographql.apollo.api.http/DefaultHttpRequestComposer : com.apollographql.apollo.api.http/HttpRequestComposer { // com.apollographql.apollo.api.http/DefaultHttpRequestComposer|null[0]
     constructor <init>(kotlin/String) // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.<init>|<init>(kotlin.String){}[0]
-    constructor <init>(kotlin/String, kotlin/String = ...) // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.<init>|<init>(kotlin.String;kotlin.String){}[0]
 
     final fun <#A1: com.apollographql.apollo.api/Operation.Data> compose(com.apollographql.apollo.api/ApolloRequest<#A1>): com.apollographql.apollo.api.http/HttpRequest // com.apollographql.apollo.api.http/DefaultHttpRequestComposer.compose|compose(com.apollographql.apollo.api.ApolloRequest<0:0>){0§<com.apollographql.apollo.api.Operation.Data>}[0]
 

libraries/apollo-api/src/commonMain/kotlin/com/apollographql/apollo/api/http/DefaultHttpRequestComposer.kt

@@ -33,23 +33,27 @@ import okio.buffer
  */
 class DefaultHttpRequestComposer(
     private val serverUrl: String,
-    private val acceptHeaderQueriesAndMutations: String = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS,
 ) : HttpRequestComposer {
 
-  constructor(serverUrl: String) : this(
-      serverUrl = serverUrl,
-      acceptHeaderQueriesAndMutations = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS,
-  )
-
   override fun <D : Operation.Data> compose(apolloRequest: ApolloRequest<D>): HttpRequest {
     val operation = apolloRequest.operation
     val customScalarAdapters = apolloRequest.executionContext[CustomScalarAdapters] ?: CustomScalarAdapters.Empty
 
     val requestHeaders = mutableListOf<HttpHeader>().apply {
-      add(HttpHeader("Accept", if (apolloRequest.operation is Subscription<*>) HEADER_ACCEPT_VALUE_SUBSCRIPTIONS else acceptHeaderQueriesAndMutations))
       if (apolloRequest.httpHeaders != null) {
         addAll(apolloRequest.httpHeaders)
       }
+      if (get("accept") == null) {
+        add(
+            HttpHeader("accept",
+                if (apolloRequest.operation is Subscription<*>) {
+                  "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
+                } else {
+                  "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
+                }
+            )
+        )
+      }
     }
 
     val sendApqExtensions = apolloRequest.sendApqExtensions ?: false
@@ -109,11 +113,6 @@ class DefaultHttpRequestComposer(
     @ApolloDeprecatedSince(ApolloDeprecatedSince.Version.v5_0_0)
     val HEADER_ACCEPT_VALUE_MULTIPART = "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
 
-    private const val HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS =
-      "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
-    private const val HEADER_ACCEPT_VALUE_SUBSCRIPTIONS =
-      "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
-
     private fun <D : Operation.Data> buildGetUrl(
         serverUrl: String,
         operation: Operation<D>,

libraries/apollo-runtime/src/commonMain/kotlin/com/apollographql/apollo/network/http/HttpNetworkTransport.kt

@@ -55,6 +55,17 @@ private constructor(
       request: ApolloRequest<D>,
   ): Flow<ApolloResponse<D>> {
     val customScalarAdapters = request.executionContext[CustomScalarAdapters]!!
+
+    val request = if (request.httpHeaders.orEmpty().none { it.name.lowercase() == "accept" }) {
+      val accept = if (request.operation is Subscription<*>) {
+        "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
+      } else {
+        incrementalDeliveryProtocolImpl.acceptHeader
+      }
+      request.newBuilder().addHttpHeader("accept", accept).build()
+    } else {
+      request
+    }
     val httpRequest = httpRequestComposer.compose(request)
 
     return execute(request, httpRequest, customScalarAdapters)
@@ -382,12 +393,7 @@ private constructor(
         "It is an error to set both 'httpRequestComposer' and 'serverUrl'"
       }
       val composer = httpRequestComposer
-          ?: serverUrl?.let {
-            DefaultHttpRequestComposer(
-                serverUrl = it,
-                acceptHeaderQueriesAndMutations = incrementalDeliveryProtocol.impl.acceptHeader,
-            )
-          }
+          ?: serverUrl?.let { DefaultHttpRequestComposer(it) }
           ?: error("No HttpRequestComposer found. Use 'httpRequestComposer' or 'serverUrl'")
 
       if (headers.isNotEmpty()) {