Merge pull request #12 from dkoster95/bugfix/HTTPResponse-Decoded

Added fix for Parameter mapping url and sendable types

Author: dkoster95

Sources/Certificate Pinning/CertificatePinner.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol CertificatePinner {
+public protocol CertificatePinner: Sendable {
     func isServerTrusted(challenge: URLAuthenticationChallenge) -> Bool
 }
 

Sources/Certificate Pinning/CertificatePinningStrategy.swift

@@ -9,9 +9,9 @@
 import Foundation
 
 public struct CertificatePinningStrategy: PinningStrategy {
-    private let certificateBuilders: [() -> SecCertificate]
+    private let certificateBuilders: [@Sendable () -> SecCertificate]
 
-    public init(certificateBuilders: [() -> SecCertificate]) {
+    public init(certificateBuilders: [@Sendable () -> SecCertificate]) {
         self.certificateBuilders = certificateBuilders
     }
 

Sources/Certificate Pinning/Hasher.swift

@@ -9,11 +9,11 @@
 import Foundation
 import CryptoKit
 
-public protocol Hasher {
+public protocol Hasher: Sendable {
     func hash(data: Data) -> String
 }
 
-public class CKSHA256Hasher: Hasher {
+public final class CKSHA256Hasher: Hasher {
 
     public init() {
 

Sources/Certificate Pinning/PinningStrategy.swift

@@ -8,6 +8,6 @@
 
 import Foundation
 
-public protocol PinningStrategy {
+public protocol PinningStrategy: Sendable {
     func validate(serverTrust: SecTrust) -> Bool
 }

Sources/Certificate Pinning/URLSessionPinningDelegate.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public protocol URLSessionPinningDelegateAdaptable {
+public protocol URLSessionPinningDelegateAdaptable: Sendable {
     func urlSession(didReceive challenge: URLAuthenticationChallenge,
                     completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
 }

Sources/ParameterEncoding/ParameterEncoding.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 
-public enum HTTPMethod: String {
+public enum HTTPMethod: String, Sendable {
     case options = "OPTIONS"
     case get     = "GET"
     case head    = "HEAD"

Sources/ParameterEncoding/StringEncoding.swift

@@ -59,6 +59,11 @@ public class StringEncoding: ParameterEncoding {
 }
 
 public struct StringURLTransformer: URLTransformer {
+    
+    public init() {
+        
+    }
+    
     public func transform(url: String, parameters: [String : any Sendable]) -> String {
         guard !parameters.isEmpty else { return url }
         var urlString = url

Sources/ParameterEncoding/URLTransformer.swift

@@ -39,9 +39,9 @@ public struct ParameterMappingURLTransformer: URLTransformer {
         guard !url.isEmpty else { return url }
         let parameters = parameters.flatMap { (key, value) in EncodingHelpers.queryComponents(fromKey: key, value: value) }
         guard !parameters.isEmpty else { return url }
-        var urlResult = EncodingHelpers.escape(url)
+        var urlResult = url
         for (key, value) in parameters {
-            let escapedKey = EncodingHelpers.escape("{\(key)}")
+            let escapedKey = "{\(key)}"
             urlResult = urlResult.replacingOccurrences(of: escapedKey, with: value)
         }
         return urlResult

Sources/Request/HTTPRequest.swift

@@ -7,25 +7,25 @@
 import Foundation
 import Combine
 
-public protocol DataTask: NSObjectProtocol {
+public protocol DataTask: NSObjectProtocol, Sendable {
     func resume()
     func suspend()
     func cancel()
 }
 
-public protocol HTTPRequest {
+public protocol HTTPRequest: Sendable {
     var headers: [String: String] { get }
     var body: Data? { get }
     var url: String { get }
     var method: HTTPMethod { get }
 }
 
-public protocol HTTPRequestActionable {
+public protocol HTTPRequestActionable: Sendable {
     func response() async throws -> HTTPResponse
     var responsePublisher: any Publisher<HTTPResponse, Error> { get }
 }
 
-public protocol HTTPRequestDecodedActionable<ResponseType> {
+public protocol HTTPRequestDecodedActionable<ResponseType>: Sendable {
     associatedtype ResponseType: Codable
     func responseDecoded() async throws -> Response<ResponseType>
     var responseDecodedPublisher: any Publisher<ResponseType, Error> { get }

Sources/Request/HTTPResponse.swift

@@ -7,9 +7,9 @@
 
 import Foundation
 
-public protocol HTTPResponse {
+public protocol HTTPResponse: Sendable {
     var statusCode: HTTPStatusCode { get }
-    var headers: [AnyHashable: Any] { get }
+    var headers: [String: String] { get }
     var body: Data? { get }
 }
 
@@ -25,12 +25,12 @@ public extension HTTPResponse {
 
 public struct QHHTTPResponse: HTTPResponse {
     public let statusCode: HTTPStatusCode
-    public let headers: [AnyHashable : Any]
+    public let headers: [String : String]
     public let body: Data?
 
     public init(body: Data?, urlResponse: URLResponse) {
         self.body = body
-        self.headers = (urlResponse as? HTTPURLResponse)?.allHeaderFields ?? [:]
+        self.headers = ((urlResponse as? HTTPURLResponse)?.allHeaderFields as? [String: String]) ?? [:]
         self.statusCode = HTTPStatusCode(rawValue: (urlResponse as? HTTPURLResponse)?.statusCode ?? -1) ?? .serviceUnavailable
     }
 }