From 4629473e6d81b894eeed56d2f35eccbf1e6d5d09 Mon Sep 17 00:00:00 2001
From: Calvin Cestari <calvin.cestari@gmail.com>
Date: Mon, 16 Dec 2024 15:36:46 -0800
Subject: [PATCH 1/5] Support new content type

---
 apollo-ios/Sources/Apollo/RequestChainNetworkTransport.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apollo-ios/Sources/Apollo/RequestChainNetworkTransport.swift b/apollo-ios/Sources/Apollo/RequestChainNetworkTransport.swift
index 0405e1394..98b49fc3b 100644
--- a/apollo-ios/Sources/Apollo/RequestChainNetworkTransport.swift
+++ b/apollo-ios/Sources/Apollo/RequestChainNetworkTransport.swift
@@ -103,13 +103,13 @@ open class RequestChainNetworkTransport: NetworkTransport {
     if Operation.operationType == .subscription {
       request.addHeader(
         name: "Accept",
-        value: "multipart/mixed;\(MultipartResponseSubscriptionParser.protocolSpec),application/json"
+        value: "multipart/mixed;\(MultipartResponseSubscriptionParser.protocolSpec),application/graphql-response+json,application/json"
       )
 
     } else {
       request.addHeader(
         name: "Accept",
-        value: "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/json"
+        value: "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/graphql-response+json,application/json"
       )
     }
 

From c02a3ff866df553762fc4a5b66e28c03e909658d Mon Sep 17 00:00:00 2001
From: Calvin Cestari <calvin.cestari@gmail.com>
Date: Mon, 16 Dec 2024 15:37:15 -0800
Subject: [PATCH 2/5] Refactor content type error messages

---
 .../Sources/Apollo/MultipartResponseDeferParser.swift       | 6 ++++--
 .../Apollo/MultipartResponseSubscriptionParser.swift        | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift b/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift
index e959be77a..96827928a 100644
--- a/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift
+++ b/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift
@@ -13,7 +13,7 @@ struct MultipartResponseDeferParser: MultipartResponseSpecificationParser {
       switch self {
 
       case let .unsupportedContentType(type):
-        return "Unsupported content type: application/json is required but got \(type)."
+        return "Unsupported content type: 'application/graphql-response+json' or 'application/json' are supported, received '\(type)'."
       case .cannotParseChunkData:
         return "The chunk data could not be parsed."
       case .cannotParsePayloadData:
@@ -53,7 +53,9 @@ struct MultipartResponseDeferParser: MultipartResponseSpecificationParser {
     for dataLine in chunk.components(separatedBy: Self.dataLineSeparator.description) {
       switch DataLine(dataLine.trimmingCharacters(in: .newlines)) {
       case let .contentHeader(directives):
-        guard directives.contains("application/json") else {
+        guard directives.contains(where: { directive in
+          directive == "application/json" || directive == "application/graphql-response+json"
+        }) else {
           return .failure(ParsingError.unsupportedContentType(type: directives.joined(separator: ";")))
         }
 
diff --git a/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift b/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift
index 72985d1c3..9eba3bd2f 100644
--- a/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift
+++ b/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift
@@ -15,7 +15,7 @@ struct MultipartResponseSubscriptionParser: MultipartResponseSpecificationParser
       switch self {
 
       case let .unsupportedContentType(type):
-        return "Unsupported content type: application/json is required but got \(type)."
+        return "Unsupported content type: 'application/graphql-response+json' or 'application/json' are supported, received '\(type)'."
       case .cannotParseChunkData:
         return "The chunk data could not be parsed."
       case let .irrecoverableError(message):
@@ -71,7 +71,9 @@ struct MultipartResponseSubscriptionParser: MultipartResponseSpecificationParser
         break
 
       case let .contentHeader(directives):
-        guard directives.contains("application/json") else {
+        guard directives.contains(where: { directive in
+          directive == "application/json" || directive == "application/graphql-response+json"
+        }) else {
           return .failure(ParsingError.unsupportedContentType(type: directives.joined(separator: ";")))
         }
 

From 3cc4cb0e48aa73226078fd5e1d2cc41fabee92b9 Mon Sep 17 00:00:00 2001
From: Calvin Cestari <calvin.cestari@gmail.com>
Date: Mon, 16 Dec 2024 15:37:51 -0800
Subject: [PATCH 3/5] Update tests

---
 .../MultipartResponseDeferParserTests.swift   | 50 +++++++++++++++++++
 ...ipartResponseSubscriptionParserTests.swift | 41 +++++++++++++++
 Tests/ApolloTests/RequestChainTests.swift     | 12 ++---
 3 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/Tests/ApolloTests/Interceptors/MultipartResponseDeferParserTests.swift b/Tests/ApolloTests/Interceptors/MultipartResponseDeferParserTests.swift
index f74805136..98f335b6c 100644
--- a/Tests/ApolloTests/Interceptors/MultipartResponseDeferParserTests.swift
+++ b/Tests/ApolloTests/Interceptors/MultipartResponseDeferParserTests.swift
@@ -218,6 +218,56 @@ final class MultipartResponseDeferParserTests: XCTestCase {
     wait(for: [expectation], timeout: defaultTimeout)
   }
 
+  func test__parsing__givenSingleChunk_withGraphQLOverHTTPContentType_shouldReturnSuccess() throws {
+    let subject = InterceptorTester(interceptor: MultipartResponseParsingInterceptor())
+
+    let expectation = expectation(description: "Received callback")
+
+    let expected: JSONObject = [
+      "data": [
+        "key": "value"
+      ],
+      "hasNext": true
+    ]
+
+    subject.intercept(
+      request: .mock(operation: MockQuery.mock()),
+      response: .mock(
+        headerFields: ["Content-Type": "multipart/mixed;boundary=graphql;deferSpec=20220824"],
+        data: """
+          
+          --graphql
+          content-type: application/graphql-response+json
+
+          {
+            "data" : {
+              "key" : "value"
+            },
+            "hasNext": true
+          }
+          --graphql--
+          """.crlfFormattedData()
+      )
+    ) { result in
+      defer {
+        expectation.fulfill()
+      }
+
+      expect(result).to(beSuccess())
+
+      guard
+        let response = try! result.get(),
+        let deserialized = try! JSONSerialization.jsonObject(with: response.rawData) as? JSONObject
+      else {
+        return fail("data could not be deserialized!")
+      }
+
+      expect(deserialized).to(equal(expected))
+    }
+
+    wait(for: [expectation], timeout: defaultTimeout)
+  }
+
   func test__parsing__givenMultipleChunks_shouldReturnMultipleSuccess() throws {
     let subject = InterceptorTester(interceptor: MultipartResponseParsingInterceptor())
 
diff --git a/Tests/ApolloTests/Interceptors/MultipartResponseSubscriptionParserTests.swift b/Tests/ApolloTests/Interceptors/MultipartResponseSubscriptionParserTests.swift
index 9a561f750..ebf067117 100644
--- a/Tests/ApolloTests/Interceptors/MultipartResponseSubscriptionParserTests.swift
+++ b/Tests/ApolloTests/Interceptors/MultipartResponseSubscriptionParserTests.swift
@@ -516,6 +516,47 @@ final class MultipartResponseSubscriptionParserTests: XCTestCase {
     wait(for: [expectation], timeout: defaultTimeout)
   }
 
+  func test__parsing__givenSingleChunk_withGraphQLOverHTTPContentType_shouldReturnSuccess() throws {
+    let network = buildNetworkTransport(responseData: """
+      
+      --graphql
+      content-type: application/graphql-response+json
+
+      {
+        "payload": {
+          "data": {
+            "__typename": "Time",
+            "ticker": 1
+          }
+        }
+      }
+      --graphql--
+      """.crlfFormattedData()
+    )
+
+    let expectedData = try Time(data: [
+      "__typename": "Time",
+      "ticker": 1
+    ], variables: nil)
+
+    let expectation = expectation(description: "Multipart data received")
+
+    _ = network.send(operation: MockSubscription<Time>()) { result in
+      defer {
+        expectation.fulfill()
+      }
+
+      switch (result) {
+      case let .success(data):
+        expect(data.data).to(equal(expectedData))
+      case let .failure(error):
+        fail("Unexpected failure result - \(error)")
+      }
+    }
+
+    wait(for: [expectation], timeout: defaultTimeout)
+  }
+
   func test__parsing__givenSingleChunk_withDashBoundaryInMessageBody_shouldReturnSuccess() throws {
     let multipartBoundary = "-"
     let network = buildNetworkTransport(
diff --git a/Tests/ApolloTests/RequestChainTests.swift b/Tests/ApolloTests/RequestChainTests.swift
index 871c69c6b..197827e92 100644
--- a/Tests/ApolloTests/RequestChainTests.swift
+++ b/Tests/ApolloTests/RequestChainTests.swift
@@ -375,7 +375,7 @@ class RequestChainTests: XCTestCase {
         return
       }
 
-      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseSubscriptionParser.protocolSpec),application/json")
+      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseSubscriptionParser.protocolSpec),application/graphql-response+json,application/json")
       expectation.fulfill()
     }
 
@@ -400,7 +400,7 @@ class RequestChainTests: XCTestCase {
         return
       }
 
-      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseSubscriptionParser.protocolSpec),application/json")
+      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseSubscriptionParser.protocolSpec),application/graphql-response+json,application/json")
       XCTAssertNotNil(request.allHTTPHeaderFields?["Random"])
       expectation.fulfill()
     }
@@ -430,7 +430,7 @@ class RequestChainTests: XCTestCase {
         return
       }
 
-      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/json")
+      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/graphql-response+json,application/json")
       expectation.fulfill()
     }
 
@@ -455,7 +455,7 @@ class RequestChainTests: XCTestCase {
         return
       }
 
-      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/json")
+      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/graphql-response+json,application/json")
       expectation.fulfill()
     }
 
@@ -480,7 +480,7 @@ class RequestChainTests: XCTestCase {
         return
       }
 
-      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/json")
+      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/graphql-response+json,application/json")
       XCTAssertNotNil(request.allHTTPHeaderFields?["Random"])
       expectation.fulfill()
     }
@@ -510,7 +510,7 @@ class RequestChainTests: XCTestCase {
         return
       }
 
-      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/json")
+      XCTAssertEqual(header, "multipart/mixed;\(MultipartResponseDeferParser.protocolSpec),application/graphql-response+json,application/json")
       XCTAssertNotNil(request.allHTTPHeaderFields?["Random"])
       expectation.fulfill()
     }

From ac3affa8681bdb3d4ede2b3897d05864bf2c2323 Mon Sep 17 00:00:00 2001
From: Calvin Cestari <calvin.cestari@gmail.com>
Date: Mon, 16 Dec 2024 16:08:40 -0800
Subject: [PATCH 4/5] Add GraphQL response parsing tests

---
 Tests/ApolloTests/RequestChainTests.swift | 189 ++++++++++++++++++++++
 1 file changed, 189 insertions(+)

diff --git a/Tests/ApolloTests/RequestChainTests.swift b/Tests/ApolloTests/RequestChainTests.swift
index 197827e92..fbce37249 100644
--- a/Tests/ApolloTests/RequestChainTests.swift
+++ b/Tests/ApolloTests/RequestChainTests.swift
@@ -1215,4 +1215,193 @@ class RequestChainTests: XCTestCase {
     // then
     wait(for: expectations, timeout: 1, enforceOrder: true)
   }
+
+  // MARK: Response Tests
+
+  func test__response__givenUnsuccessfulStatusCode_shouldFail() throws {
+    // given
+    let client = MockURLSessionClient(
+      response: .mock(
+        url: TestURL.mockServer.url,
+        statusCode: 500,
+        httpVersion: nil,
+        headerFields: nil
+      ),
+      data: """
+      {
+        "data": {
+          "__typename": "Hero",
+          "name": "R2-D2"
+        }
+      }
+      """.data(using: .utf8)
+    )
+
+    let provider = DefaultInterceptorProvider(
+      client: client,
+      store: ApolloStore()
+    )
+
+    let transport = RequestChainNetworkTransport(
+      interceptorProvider: provider,
+      endpointURL: TestURL.mockServer.url
+    )
+
+    let expectation = expectation(description: "Response received")
+
+    _ = transport.send(operation: MockQuery<Hero>()) { result in
+      switch result {
+      case .success:
+        XCTFail("Unexpected response: \(result)")
+
+      case .failure:
+        expectation.fulfill()
+      }
+    }
+
+    wait(for: [expectation], timeout: 1)
+  }
+
+  // This test is odd because you might assume it would fail but there is no content-type checking on standard
+  // GraphQL response parsing. So this test is here to ensure that existing behaviour does not change.
+  func test__response__givenUnknownContentType_shouldNotFail() throws {
+    // given
+    let client = MockURLSessionClient(
+      response: .mock(
+        url: TestURL.mockServer.url,
+        statusCode: 200,
+        httpVersion: nil,
+        headerFields: ["content-type": "unknown/type"]
+      ),
+      data: """
+      {
+        "data": {
+          "__typename": "Hero",
+          "name": "R2-D2"
+        }
+      }
+      """.data(using: .utf8)
+    )
+
+    let provider = DefaultInterceptorProvider(
+      client: client,
+      store: ApolloStore()
+    )
+
+    let transport = RequestChainNetworkTransport(
+      interceptorProvider: provider,
+      endpointURL: TestURL.mockServer.url
+    )
+
+    let expectation = expectation(description: "Response received")
+
+    _ = transport.send(operation: MockQuery<Hero>()) { result in
+      switch result {
+      case let .success(responseData):
+        XCTAssertEqual(responseData.data?.__typename, "Hero")
+        XCTAssertEqual(responseData.data?.name, "R2-D2")
+
+        expectation.fulfill()
+
+      case .failure:
+        XCTFail("Unexpected response: \(result)")
+      }
+    }
+
+    wait(for: [expectation], timeout: 1)
+  }
+
+  func test__response__givenJSONContentType_shouldSucceed() throws {
+    // given
+    let client = MockURLSessionClient(
+      response: .mock(
+        url: TestURL.mockServer.url,
+        statusCode: 200,
+        httpVersion: nil,
+        headerFields: ["content-type": "application/json"]
+      ),
+      data: """
+      {
+        "data": {
+          "__typename": "Hero",
+          "name": "R2-D2"
+        }
+      }
+      """.data(using: .utf8)
+    )
+
+    let provider = DefaultInterceptorProvider(
+      client: client,
+      store: ApolloStore()
+    )
+
+    let transport = RequestChainNetworkTransport(
+      interceptorProvider: provider,
+      endpointURL: TestURL.mockServer.url
+    )
+
+    let expectation = expectation(description: "Response received")
+
+    _ = transport.send(operation: MockQuery<Hero>()) { result in
+      switch result {
+      case let .success(responseData):
+        XCTAssertEqual(responseData.data?.__typename, "Hero")
+        XCTAssertEqual(responseData.data?.name, "R2-D2")
+
+        expectation.fulfill()
+
+      case .failure:
+        XCTFail("Unexpected response: \(result)")
+      }
+    }
+
+    wait(for: [expectation], timeout: 1)
+  }
+
+  func test__response__givenGraphQLOverHTTPContentType_shouldSucceed() throws {
+    // given
+    let client = MockURLSessionClient(
+      response: .mock(
+        url: TestURL.mockServer.url,
+        statusCode: 200,
+        httpVersion: nil,
+        headerFields: ["content-type": "application/graphql-response+json"]
+      ),
+      data: """
+      {
+        "data": {
+          "__typename": "Hero",
+          "name": "R2-D2"
+        }
+      }
+      """.data(using: .utf8)
+    )
+
+    let provider = DefaultInterceptorProvider(
+      client: client,
+      store: ApolloStore()
+    )
+
+    let transport = RequestChainNetworkTransport(
+      interceptorProvider: provider,
+      endpointURL: TestURL.mockServer.url
+    )
+
+    let expectation = expectation(description: "Response received")
+
+    _ = transport.send(operation: MockQuery<Hero>()) { result in
+      switch result {
+      case let .success(responseData):
+        XCTAssertEqual(responseData.data?.__typename, "Hero")
+        XCTAssertEqual(responseData.data?.name, "R2-D2")
+
+        expectation.fulfill()
+
+      case .failure:
+        XCTFail("Unexpected response: \(result)")
+      }
+    }
+
+    wait(for: [expectation], timeout: 1)
+  }
 }

From 179d0043f690ae8c215e9b66d55306bfa68c127a Mon Sep 17 00:00:00 2001
From: Calvin Cestari <calvin.cestari@gmail.com>
Date: Wed, 8 Jan 2025 17:10:29 -0800
Subject: [PATCH 5/5] Refactor out duplicated string comparisons

---
 apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift  | 4 +---
 .../Sources/Apollo/MultipartResponseParsingInterceptor.swift  | 4 ++++
 .../Sources/Apollo/MultipartResponseSubscriptionParser.swift  | 4 +---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift b/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift
index 96827928a..0aecba4f2 100644
--- a/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift
+++ b/apollo-ios/Sources/Apollo/MultipartResponseDeferParser.swift
@@ -53,9 +53,7 @@ struct MultipartResponseDeferParser: MultipartResponseSpecificationParser {
     for dataLine in chunk.components(separatedBy: Self.dataLineSeparator.description) {
       switch DataLine(dataLine.trimmingCharacters(in: .newlines)) {
       case let .contentHeader(directives):
-        guard directives.contains(where: { directive in
-          directive == "application/json" || directive == "application/graphql-response+json"
-        }) else {
+        guard directives.contains(where: { $0.isValidGraphQLContentType }) else {
           return .failure(ParsingError.unsupportedContentType(type: directives.joined(separator: ";")))
         }
 
diff --git a/apollo-ios/Sources/Apollo/MultipartResponseParsingInterceptor.swift b/apollo-ios/Sources/Apollo/MultipartResponseParsingInterceptor.swift
index 5975058fe..e29344ede 100644
--- a/apollo-ios/Sources/Apollo/MultipartResponseParsingInterceptor.swift
+++ b/apollo-ios/Sources/Apollo/MultipartResponseParsingInterceptor.swift
@@ -194,4 +194,8 @@ extension String {
       .components(separatedBy: ";")
       .map({ $0.trimmingCharacters(in: .whitespaces) })
   }
+
+  var isValidGraphQLContentType: Bool {
+    self == "application/json" || self == "application/graphql-response+json"
+  }
 }
diff --git a/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift b/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift
index 9eba3bd2f..cc8054e4f 100644
--- a/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift
+++ b/apollo-ios/Sources/Apollo/MultipartResponseSubscriptionParser.swift
@@ -71,9 +71,7 @@ struct MultipartResponseSubscriptionParser: MultipartResponseSpecificationParser
         break
 
       case let .contentHeader(directives):
-        guard directives.contains(where: { directive in
-          directive == "application/json" || directive == "application/graphql-response+json"
-        }) else {
+        guard directives.contains(where: { $0.isValidGraphQLContentType }) else {
           return .failure(ParsingError.unsupportedContentType(type: directives.joined(separator: ";")))
         }