Mahtan/Hermes
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases 6 Wiki Activity

✨ Remove unused default headers & allow request specific headers

Browse Source
This commit is contained in:
Victor Bodinaud
2024-06-03 13:46:51 +02:00
parent 9e97d9195c
commit 98423afa91
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Sources/Hermes/Hermes.swift
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,37 @@ public final class Hermes {
} }
private var defaultHeaders: [String: String] { private var defaultHeaders: [String: String] {
var headers = ["Content-Type": "application/json"] return config.defaultHeaders
if let token = UserDefaults.standard.string(forKey: "authToken") {
headers["Authorization"] = "Bearer \(token)"
}
headers.merge(config.defaultHeaders) { (_, new) in new }
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 +133,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

2
Tests/HermesTests/HermesTests.swift
View File

@@ -8,7 +8,7 @@ final class HermesTests: XCTestCase {
} }
private func configureHermes() { private func configureHermes() {
let defaultHeaders = ["Custom-Header": "HeaderValue"] let defaultHeaders = ["Content-Type": "application/json"]
let decodingStrategy = JSONDecoder.KeyDecodingStrategy.convertFromSnakeCase let decodingStrategy = JSONDecoder.KeyDecodingStrategy.convertFromSnakeCase
let config = HermesConfiguration(defaultHeaders: defaultHeaders, decodingStrategy: decodingStrategy) let config = HermesConfiguration(defaultHeaders: defaultHeaders, decodingStrategy: decodingStrategy)
Hermes.shared.configure(config) Hermes.shared.configure(config)