Do not expose accept headers in DefaultHttpRequestComposer's public API

Author: BoD

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

@@ -7,6 +7,7 @@ import com.apollographql.apollo.api.CustomScalarAdapters
 import com.apollographql.apollo.api.Operation
 import com.apollographql.apollo.api.Subscription
 import com.apollographql.apollo.api.Upload
+import com.apollographql.apollo.api.http.DefaultHttpRequestComposer.Companion.composePostParams
 import com.apollographql.apollo.api.http.internal.urlEncode
 import com.apollographql.apollo.api.json.JsonWriter
 import com.apollographql.apollo.api.json.buildJsonByteString
@@ -32,14 +33,12 @@ import okio.buffer
  */
 class DefaultHttpRequestComposer(
     private val serverUrl: String,
-    private val acceptHeaderQueriesAndMutations: String = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824,
-    private val acceptHeaderSubscriptions: String = HEADER_ACCEPT_VALUE_SUBSCRIPTIONS_1_0,
+    private val acceptHeaderQueriesAndMutations: String = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS,
 ) : HttpRequestComposer {
 
   constructor(serverUrl: String) : this(
       serverUrl = serverUrl,
-      acceptHeaderQueriesAndMutations = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824,
-      acceptHeaderSubscriptions = HEADER_ACCEPT_VALUE_SUBSCRIPTIONS_1_0,
+      acceptHeaderQueriesAndMutations = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS,
   )
 
   override fun <D : Operation.Data> compose(apolloRequest: ApolloRequest<D>): HttpRequest {
@@ -48,7 +47,7 @@ class DefaultHttpRequestComposer(
 
     val requestHeaders = mutableListOf<HttpHeader>().apply {
       if (apolloRequest.operation is Subscription<*>) {
-        add(HttpHeader(HEADER_ACCEPT_NAME, acceptHeaderSubscriptions))
+        add(HttpHeader(HEADER_ACCEPT_NAME, HEADER_ACCEPT_VALUE_SUBSCRIPTIONS))
       } else {
         add(HttpHeader(HEADER_ACCEPT_NAME, acceptHeaderQueriesAndMutations))
       }
@@ -100,25 +99,11 @@ class DefaultHttpRequestComposer(
     // and thus is safe to execute.
     // See https://www.apollographql.com/docs/apollo-server/security/cors/#preventing-cross-site-request-forgery-csrf
     // for details.
-    internal val HEADER_APOLLO_REQUIRE_PREFLIGHT = "Apollo-Require-Preflight"
+    private const val HEADER_APOLLO_REQUIRE_PREFLIGHT = "Apollo-Require-Preflight"
 
-    val HEADER_ACCEPT_NAME = "Accept"
-
-    const val HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824 =
-      "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
-
-    // TODO To be agreed upon with the router and other clients
-    const val HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20230621 =
-      "multipart/mixed;incrementalDeliverySpec=20230621, application/graphql-response+json, application/json"
-
-    const val HEADER_ACCEPT_VALUE_SUBSCRIPTIONS_1_0 =
-      "multipart/mixed;subscriptionSpec=1.0, application/graphql-response+json, application/json"
-
-    @Deprecated("Use HEADER_ACCEPT_VALUE_SUBSCRIPTIONS_1_0 instead", ReplaceWith("HEADER_ACCEPT_VALUE_SUBSCRIPTIONS_1_0"))
-    val HEADER_ACCEPT_VALUE_MULTIPART = HEADER_ACCEPT_VALUE_SUBSCRIPTIONS_1_0
-
-    @Deprecated("Use HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824 instead", ReplaceWith("HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824"))
-    val HEADER_ACCEPT_VALUE_DEFER = HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824
+    private const val HEADER_ACCEPT_NAME = "Accept"
+    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,

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

@@ -427,7 +427,7 @@ private constructor(
      */
     object Defer20220824 : IncrementalDeliveryProtocol {
       @ApolloInternal
-      override val acceptHeader: String = DefaultHttpRequestComposer.HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20220824
+      override val acceptHeader: String = "multipart/mixed;deferSpec=20220824, application/graphql-response+json, application/json"
 
       @ApolloInternal
       override fun newIncrementalResultsMerger(): IncrementalResultsMerger = Defer20220824IncrementalResultsMerger()
@@ -440,7 +440,8 @@ private constructor(
      */
     object GraphQL17Alpha9 : IncrementalDeliveryProtocol {
       @ApolloInternal
-      override val acceptHeader: String = DefaultHttpRequestComposer.HEADER_ACCEPT_VALUE_QUERIES_AND_MUTATIONS_20230621
+      // TODO To be agreed upon with the router and other clients
+      override val acceptHeader: String = "multipart/mixed;incrementalDeliverySpec=20230621, application/graphql-response+json, application/json"
 
       @ApolloInternal
       override fun newIncrementalResultsMerger(): IncrementalResultsMerger = GraphQL17Alpha9IncrementalResultsMerger()