Merge pull request #1420 from dchohfi/dchohfi/prevent-headers-lost

Prevent request headers from getting lost
apollographql · Sep 29, 2020 · 0f2eb0f · 0f2eb0f
2 parents 334ba29 + 3d28961
commit 0f2eb0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Sources/Apollo/JSONRequest.swift b/Sources/Apollo/JSONRequest.swift
@@ -98,7 +98,7 @@ open class JSONRequest<Operation: GraphQLOperation>: HTTPRequest<Operation> {
     case .GET:
       let transformer = GraphQLGETTransformer(body: body, url: self.graphQLEndpoint)
       if let urlForGet = transformer.createGetURL() {
-        request = URLRequest(url: urlForGet)
+        request.url = urlForGet
         request.httpMethod = GraphQLHTTPMethod.GET.rawValue
       } else {
         throw GraphQLHTTPRequestError.serializedQueryParamsMessageError

diff --git a/Tests/ApolloTests/AutomaticPersistedQueriesTests.swift b/Tests/ApolloTests/AutomaticPersistedQueriesTests.swift
@@ -388,6 +388,7 @@ class AutomaticPersistedQueriesTests: XCTestCase {
     let provider = LegacyInterceptorProvider(client: mockClient)
     let network = RequestChainNetworkTransport(interceptorProvider: provider,
                                                endpointURL: self.endpoint,
+                                               additionalHeaders: ["Authentication": "Bearer 1234"],
                                                useGETForQueries: true)
 
     let expectation = self.expectation(description: "Query sent")
@@ -403,6 +404,7 @@ class AutomaticPersistedQueriesTests: XCTestCase {
 
     XCTAssertEqual(request.url?.host, network.endpointURL.host)
     XCTAssertEqual(request.httpMethod, "GET")
+    XCTAssertEqual(request.allHTTPHeaderFields!["Authentication"], "Bearer 1234")
 
     try self.validateUrlParams(with: request,
                                query: query,