Merge pull request #48 from UbiqueInnovation/bugfix/TOPO-2278-fix-hea…

…d-request TOPO-2278: Allow head request to proceed
UbiqueInnovation · Mar 9, 2023 · 1430188 · 1430188
2 parents ed6d9a0 + 34b6e99
commit 1430188
Showing 1 changed file with 20 additions and 6 deletions.
diff --git a/Sources/UBFoundation/Networking/UBURLDataTask.swift b/Sources/UBFoundation/Networking/UBURLDataTask.swift
@@ -766,9 +766,7 @@ extension UBURLDataTask {
             // Create the block that gets called when decoding is ready
             executionBlock = { data, response, info, callbackQueue, caller in
                 guard let data = data else {
-                    callbackQueue.addOperation {
-                        completion(.failure(UBNetworkingError.internal(.responseBodyIsEmpty)), response, info, caller)
-                    }
+                    Self.handleMissingData(from: response, info: info, callbackQueue: callbackQueue, caller: caller, completion: completion)
                     return
                 }
                 do {
@@ -791,15 +789,31 @@ extension UBURLDataTask {
             }
         }
 
+        private static func handleMissingData<T>(from response: HTTPURLResponse?, info: UBNetworkingTaskInfo?, callbackQueue: OperationQueue, caller: UBURLDataTask, completion: @escaping CompletionHandlingBlock<T>) {
+            guard caller.request.httpMethod == .head else {
+                callbackQueue.addOperation {
+                    completion(.failure(UBNetworkingError.internal(.responseBodyIsEmpty)), response, info, caller)
+                }
+                return
+            }
+
+            guard let data = Data() as? T else {
+                assertionFailure("HEAD request should always be used with passthrough decoder")
+                return
+            }
+
+            callbackQueue.addOperation {
+                completion(.success(data), response, info, caller)
+            }
+        }
+
         /// :nodoc:
         init<T, E: UBURLDataTaskErrorBody>(decoder: UBURLDataTaskDecoder<T>, errorDecoder: UBURLDataTaskDecoder<E>, completion: @escaping CompletionHandlingBlock<T>, callbackQueue: OperationQueue?) {
             self.callbackQueue = callbackQueue
             // Create the block that gets called when decoding is ready
             executionBlock = { data, response, info, callbackQueue, caller in
                 guard let data = data else {
-                    callbackQueue.addOperation {
-                        completion(.failure(UBNetworkingError.internal(.responseBodyIsEmpty)), response, info, caller)
-                    }
+                    Self.handleMissingData(from: response, info: info, callbackQueue: callbackQueue, caller: caller, completion: completion)
                     return
                 }
                 do {