Include context also in case of failed response.

Author: Ruben Nine

Sources/FilestackSDK/Internal/Operations/UploadOperation.swift

@@ -107,8 +107,7 @@ private extension UploadOperation {
                         self.executeCompleteOperation(using: partsAndEtags, descriptor: descriptor) { (result) in
                             switch result {
                             case let .success(response):
-                                let responseWithContext = JSONResponse(response: response, context: self.uploadable)
-                                self.finish(with: .success(responseWithContext))
+                                self.finish(with: .success(response))
                             case let .failure(error):
                                 self.finish(with: .failure(error))
                             }

Sources/FilestackSDK/Internal/Uploaders/MultipartUpload.swift

@@ -152,10 +152,10 @@ private extension MultipartUpload {
                 switch operation.result {
                 case let .success(response):
                     // Append success JSONResponse to `results`.
-                    results.append(response)
+                    results.append(JSONResponse(using: response, context: uploadable))
                 case let .failure(error):
                     // Append error JSONResponse to `results`.
-                    results.append(JSONResponse(error: error))
+                    results.append(JSONResponse(error: error, context: uploadable))
                     // Substract failed operation's `totalUnitCount` from globalProgress's `totalUnitCount`.
                     self.masterProgress.totalUnitCount -= operation.progress.totalUnitCount
                 }

Sources/FilestackSDK/Public/Models/JSONResponse.swift

@@ -33,7 +33,11 @@ public class JSONResponse: NSObject {
 
     // MARK: - Lifecycle
 
-    init(request: URLRequest? = nil, response: URLResponse? = nil, data: Data? = nil, error: Swift.Error?) {
+    init(request: URLRequest? = nil,
+         response: URLResponse? = nil,
+         data: Data? = nil,
+         error: Swift.Error?,
+         context: Any? = nil) {
         self.request = request
         self.response = response as? HTTPURLResponse
 
@@ -44,16 +48,16 @@ public class JSONResponse: NSObject {
         }
 
         self.error = error
-        self.context = nil
+        self.context = context
 
         super.init()
     }
 
-    init(response: JSONResponse, context: Any?) {
-        self.request = response.request
-        self.response = response.response
-        self.json = response.json
-        self.error = response.error
+    init(using jsonResponse: JSONResponse, context: Any?) {
+        self.request = jsonResponse.request
+        self.response = jsonResponse.response
+        self.json = jsonResponse.json
+        self.error = jsonResponse.error
         self.context = context
 
         super.init()

Tests/FilestackSDKTests/UploadTests.swift

@@ -138,7 +138,7 @@ class UploadTests: XCTestCase {
         XCTAssertTrue(uploader.progress.isCancelled)
 
         XCTAssertNotNil(response?.error)
-        XCTAssertNil(response?.context)
+        XCTAssertEqual(response?.context as? URL, sampleFileURL)
     }
 
     func testCancellingStartedUploadWithoutUploadablesShouldCallCompletionHandler() {