From 4d86ce4c54c5b1ae7cc5a1e7141c2d7906a38798 Mon Sep 17 00:00:00 2001
From: Michael Rahn <michael.rahn@digistore24.team>
Date: Mon, 28 Feb 2022 09:44:21 +0100
Subject: [PATCH] fix(ios): Add missing request error handling (#224)

* fix: Fixed missing request plugin call rejection
* refactor: Adjusted error messages to provide better information
---
 ios/Plugin/HttpRequestHandler.swift | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ios/Plugin/HttpRequestHandler.swift b/ios/Plugin/HttpRequestHandler.swift
index d3d5f26d..cbb5c81b 100644
--- a/ios/Plugin/HttpRequestHandler.swift
+++ b/ios/Plugin/HttpRequestHandler.swift
@@ -179,7 +179,7 @@ class HttpRequestHandler {
             } catch {
                 // Explicitly reject if the http request body was not set successfully,
                 // so as to not send a known malformed request, and to provide the developer with additional context.
-                call.reject("Error", "REQUEST", error, [:])
+                call.reject(error.localizedDescription, "http request", error, [:])
                 return
             }
         }
@@ -189,6 +189,8 @@ class HttpRequestHandler {
         let task = urlSession.dataTask(with: urlRequest) { (data, response, error) in
             urlSession.invalidateAndCancel();
             if error != nil {
+                CAPLog.print("Error on request", String(describing: data), String(describing: response), String(describing: error))
+                call.reject(error!.localizedDescription, "http request", error, [:])
                 return
             }
 
@@ -236,7 +238,7 @@ class HttpRequestHandler {
         let task = URLSession.shared.uploadTask(with: urlRequest, from: form) { (data, response, error) in
             if error != nil {
                 CAPLog.print("Error on upload file", String(describing: data), String(describing: response), String(describing: error))
-                call.reject("Error", "UPLOAD", error, [:])
+                call.reject(error!.localizedDescription, "http upload", error, [:])
                 return
             }
             let type = ResponseType(rawValue: responseType) ?? .default
@@ -274,12 +276,12 @@ class HttpRequestHandler {
         func handleDownload(downloadLocation: URL?, response: URLResponse?, error: Error?) {
             if error != nil {
                 CAPLog.print("Error on download file", String(describing: downloadLocation), String(describing: response), String(describing: error))
-                call.reject("Error", "DOWNLOAD", error, [:])
+                call.reject(error!.localizedDescription, "http download", error, [:])
                 return
             }
 
             guard let location = downloadLocation else {
-                call.reject("Unable to get file after downloading")
+                call.reject("Unable to get file after downloading", "http download")
                 return
             }
 
@@ -298,7 +300,7 @@ class HttpRequestHandler {
                 try fileManager.moveItem(at: location, to: dest)
                 call.resolve(["path": dest.absoluteString])
             } catch let e {
-                call.reject("Unable to download file", "DOWNLOAD", e)
+                call.reject("Unable to download file: \(e.localizedDescription)", "http download", e)
                 return
             }