Skip to content

Move headers from URLSession level to request level #764

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

Merged
merged 1 commit into from
May 27, 2025
Merged

Move headers from URLSession level to request level #764

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
20 changes: 12 additions & 8 deletions Sources/Gravatar/Network/Services/URLSessionHTTPClient.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,11 @@ struct URLSessionHTTPClient: HTTPClient {
private let urlSession: URLSessionProtocol

init(urlSession: URLSessionProtocol? = nil) {
let configuration = URLSessionConfiguration.default
configuration.httpAdditionalHeaders = [
"Accept": "application/json",
"X-Platform": "ios",
"X-SDK-Version": BundleInfo.sdkVersion ?? "",
"X-Source": BundleInfo.appName ?? "",
]
self.urlSession = urlSession ?? URLSession(configuration: configuration)
self.urlSession = urlSession ?? URLSession(configuration: URLSessionConfiguration.default)
}

func data(with request: URLRequest) async throws -> (Data, HTTPURLResponse) {
let request = request.withHeaders()
let result: (data: Data, response: URLResponse)
do {
result = try await urlSession.data(for: request)
Expand All @@ -33,6 +27,7 @@ struct URLSessionHTTPClient: HTTPClient {
}

func uploadData(with request: URLRequest, data: Data) async throws -> (Data, HTTPURLResponse) {
let request = request.withHeaders()
let result: (data: Data, response: URLResponse)
do {
result = try await urlSession.upload(for: request, from: data)
Expand All @@ -49,6 +44,15 @@ extension URLRequest {
requestCopy.setValue("Bearer \(token)", forHTTPHeaderField: "Authorization")
return requestCopy
}

func withHeaders() -> URLRequest {
var request = self
request.addValue("application/json", forHTTPHeaderField: "Accept")
request.addValue("ios", forHTTPHeaderField: "X-Platform")
request.addValue(BundleInfo.sdkVersion ?? "", forHTTPHeaderField: "X-SDK-Version")
request.addValue(BundleInfo.appName ?? "", forHTTPHeaderField: "X-Source")
return request
}
}

private func validatedHTTPResponse(_ response: URLResponse, data: Data) throws -> HTTPURLResponse {
Expand Down
Loading