Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Legacy] Remove nil values from variables field in requestBody #3400

Closed
wants to merge 2 commits into from
Closed

[Legacy] Remove nil values from variables field in requestBody #3400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
93b93f4
Include variables in requestBody if at least one value is non-nil
yramocan Jun 30, 2024
6e410d2
Add tests for variable field omission
yramocan Jun 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Sources/Apollo/RequestBodyCreator.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ extension RequestBodyCreator {
sendQueryDocument: Bool,
autoPersistQuery: Bool) -> GraphQLMap {
var body: GraphQLMap = [
"variables": operation.variables,
"operationName": operation.operationName,
]

if let variables = operation.variables?.compactMapValues({ $0 }) {
body["variables"] = variables
}

if sendOperationIdentifiers {
guard let operationIdentifier = operation.operationIdentifier else {
preconditionFailure("To send operation identifiers, Apollo types must be generated with operationIdentifiers")
Expand Down
15 changes: 15 additions & 0 deletions Tests/ApolloTests/RequestBodyCreatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,19 @@ class RequestBodyCreatorTests: XCTestCase {

XCTAssertEqual(query.queryDocument, req["test_query"] as? String)
}

func testRequestBodyOmitsVariablesFieldWhenValuesAreNil() {
let query = HeroNameQuery(episode: nil)
let req = self.create(with: apolloRequestBodyCreator, for: query)

XCTAssertFalse(req.keys.contains(where: { $0 == "variables" }))
}

func testRequestBodyIncludesVariablesFieldWhenItContainsNonNilValues() {
let episode = Episode.empire
let query = HeroNameQuery(episode: episode)
let req = self.create(with: apolloRequestBodyCreator, for: query)

XCTAssertEqual(req["variables"], ["episode": episode.rawValue])
}
}