1 Commits

Author SHA1 Message Date
Victor Bodinaud
92707810ec Remove unused default headers & allow request specific headers 2024-06-03 15:25:20 +02:00

View File

@@ -58,11 +58,13 @@ public struct Resource<T: Codable> {
let url: URL let url: URL
var method: HTTPMethod = .get([]) var method: HTTPMethod = .get([])
var modelType: T.Type var modelType: T.Type
var headers: [String: String]
public init(url: URL, method: HTTPMethod, modelType: T.Type) { public init(url: URL, method: HTTPMethod, modelType: T.Type, headers: [String: String] = [:]) {
self.url = url self.url = url
self.method = method self.method = method
self.modelType = modelType self.modelType = modelType
self.headers = headers
} }
} }
@@ -79,39 +81,44 @@ public final class Hermes {
} }
private var defaultHeaders: [String: String] { private var defaultHeaders: [String: String] {
var headers = ["Content-Type": "application/json"] var headers = [
if let token = UserDefaults.standard.string(forKey: "authToken") { "Content-Type": "application/json",
headers["Authorization"] = "Bearer \(token)" "Accept": "application/json"
} ]
headers.merge(config.defaultHeaders) { (_, new) in new }
headers.merge(config.defaultHeaders) { _, new in new }
return headers return headers
} }
public func load<T: Codable>(_ resource: Resource<T>) async throws -> T { public func load<T: Codable>(_ resource: Resource<T>) async throws -> T {
var request = URLRequest(url: resource.url) var request = URLRequest(url: resource.url)
request.httpMethod = resource.method.name request.httpMethod = resource.method.name
switch resource.method { switch resource.method {
case .get(let queryItems): case .get(let queryItems):
if let queryItems = queryItems { if let queryItems = queryItems {
var components = URLComponents(url: resource.url, resolvingAgainstBaseURL: false) var components = URLComponents(url: resource.url, resolvingAgainstBaseURL: false)
components?.queryItems = queryItems components?.queryItems = queryItems
request.url = components?.url request.url = components?.url
} }
case .post(let data), case .post(let data),
.put(let data), .put(let data),
.patch(let data): .patch(let data):
request.httpBody = data request.httpBody = data
case .delete: case .delete:
break break
} }
request.allHTTPHeaderFields = defaultHeaders var headers = defaultHeaders
let configuration = URLSessionConfiguration.default if !resource.headers.isEmpty {
configuration.httpAdditionalHeaders = defaultHeaders headers.merge(resource.headers) { _, new in new }
let session = URLSession(configuration: configuration) }
request.allHTTPHeaderFields = headers
let session = URLSession(configuration: URLSessionConfiguration.default)
let (data, response) = try await session.data(for: request) let (data, response) = try await session.data(for: request)
@@ -133,7 +140,7 @@ public final class Hermes {
private func validate(response: HTTPURLResponse) throws { private func validate(response: HTTPURLResponse) throws {
switch response.statusCode { switch response.statusCode {
case 200...299: case 200 ... 299:
return return
case 400: case 400:
throw NetworkError.badRequest throw NetworkError.badRequest