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

Switch to application/json request body #1249

Merged
merged 1 commit into from
Nov 27, 2024
Merged

Switch to application/json request body #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions Buy/Client/Graph.Client.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,18 @@ extension Graph {
}

func graphRequestFor(query: GraphQL.AbstractQuery) -> URLRequest {
var request = URLRequest(url: self.apiURL)
let requestData = String(describing: query).data(using: .utf8)!
var request = URLRequest(url: self.apiURL)

let requestData = try! JSONEncoder().encode([
"query": String(describing: query)
])

request.httpMethod = "POST"
request.httpBody = requestData
request.httpShouldHandleCookies = false

request.setValue("application/json", forHTTPHeaderField: Header.accept)
request.setValue("application/graphql", forHTTPHeaderField: Header.contentType)
request.setValue("application/json", forHTTPHeaderField: Header.contentType)
request.setValue(SHA256.hash(requestData), forHTTPHeaderField: Header.queryTag)

for (name, value) in self.headers {
Expand Down
19 changes: 15 additions & 4 deletions BuyTests/Client/Graph.ClientTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,25 @@ class Graph_ClientTests: XCTestCase {
// MARK: - Requests -
//
func testRequestGeneration() {
let client = self.defaultClient()
let request = client.graphRequestFor(query: self.defaultQueryPayload().query)
let client = self.defaultClient()
let query = self.defaultQueryPayload().query
let request = client.graphRequestFor(query: query)

XCTAssertEqual(request.httpMethod, "POST")
XCTAssertTrue(request.httpBody?.count ?? 0 > 0)

guard let bodyData = request.httpBody else {
return XCTFail("expected request to have a body")
}

let decodedBody = try! JSONDecoder().decode(
Dictionary<String, String>.self, from: bodyData
)

XCTAssertEqual(decodedBody["query"], query.description)

XCTAssertFalse(request.httpShouldHandleCookies)
XCTAssertEqual(request.value(forHTTPHeaderField: "Accept"), "application/json")
XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/graphql")
XCTAssertEqual(request.value(forHTTPHeaderField: "Content-Type"), "application/json")
XCTAssertEqual(request.value(forHTTPHeaderField: "X-Query-Tag"), SHA256.hash(request.httpBody!))

// Ensure that the client inserts defaults headers
Expand Down