chore: fixes

Author: farfromrefug

packages/https/platforms/ios/src/AlamofireWrapper.swift

@@ -71,7 +71,7 @@ public class AlamofireWrapper: NSObject {
         if let secPolicy = securityPolicy {
             // Create a server trust manager with our security policy
             let evaluators: [String: ServerTrustEvaluating] = [:] // Will be filled dynamically per request
-            let serverTrustManager = ServerTrustManager(evaluators: evaluators)
+            let serverTrustManager = ServerTrustManager(allHostsMustBeEvaluated: false, evaluators: evaluators)
 
             // Create new session with server trust manager
             session = Session(
@@ -131,7 +131,7 @@ public class AlamofireWrapper: NSObject {
         _ headers: NSDictionary?,
         _ uploadProgress: ((Progress) -> Void)?,
         _ downloadProgress: ((Progress) -> Void)?,
-        _ success: @escaping (URLSessionTask, Any?) -> Void,
+        _ success: @escaping (URLSessionTask?, Any?) -> Void,
         _ failure: @escaping (URLSessionTask?, Error) -> Void
     ) -> URLSessionTask? {
         return requestWithThreading(
@@ -158,7 +158,7 @@ public class AlamofireWrapper: NSObject {
         _ progressOnMainThread: NSNumber?, // NSNumber wrapper for optional Bool
         _ uploadProgress: ((Progress) -> Void)?,
         _ downloadProgress: ((Progress) -> Void)?,
-        _ success: @escaping (URLSessionTask, Any?) -> Void,
+        _ success: @escaping (URLSessionTask?, Any?) -> Void,
         _ failure: @escaping (URLSessionTask?, Error) -> Void
     ) -> URLSessionTask? {
 
@@ -223,8 +223,8 @@ public class AlamofireWrapper: NSObject {
 
             // Deserialize response based on responseSerializer
             if let data = response.data {
-                let result = self.responseSerializer.deserialize(data: data, response: response.response)
-                success(task, result)
+//                let result = self.responseSerializer.deserialize(data: data, response: response.response)
+                success(task, data)
             } else {
                 success(task, nil)
             }
@@ -241,7 +241,7 @@ public class AlamofireWrapper: NSObject {
         _ headers: NSDictionary?,
         _ constructingBodyWithBlock: @escaping (MultipartFormDataWrapper) -> Void,
         _ progress: ((Progress) -> Void)?,
-        _ success: @escaping (URLSessionTask, Any?) -> Void,
+        _ success: @escaping (URLSessionTask?, Any?) -> Void,
         _ failure: @escaping (URLSessionTask?, Error) -> Void
     ) -> URLSessionTask? {
         return uploadMultipartWithThreading(
@@ -264,7 +264,7 @@ public class AlamofireWrapper: NSObject {
         _ progressOnMainThread: NSNumber?,
         _ constructingBodyWithBlock: @escaping (MultipartFormDataWrapper) -> Void,
         _ progress: ((Progress) -> Void)?,
-        _ success: @escaping (URLSessionTask, Any?) -> Void,
+        _ success: @escaping (URLSessionTask?, Any?) -> Void,
         _ failure: @escaping (URLSessionTask?, Error) -> Void
     ) -> URLSessionTask? {
 
@@ -325,8 +325,8 @@ public class AlamofireWrapper: NSObject {
 
             // Deserialize response based on responseSerializer
             if let data = response.data {
-                let result = self.responseSerializer.deserialize(data: data, response: response.response)
-                success(task, result)
+//                let result = self.responseSerializer.deserialize(data: data, response: response.response)
+                success(task, data)
             } else {
                 success(task, nil)
             }
@@ -684,7 +684,7 @@ public class AlamofireWrapper: NSObject {
         _ headers: NSDictionary?,
         _ sizeThreshold: Int64,
         _ progress: ((Progress) -> Void)?,
-        _ success: @escaping (URLSessionTask, Any?, String?) -> Void,
+        _ success: @escaping (URLSessionTask?, Any?, String?) -> Void,
         _ failure: @escaping (URLSessionTask?, Error) -> Void
     ) -> URLSessionTask? {
 

src/https/request.ios.ts

@@ -366,7 +366,7 @@ class HttpsResponseLegacy implements IHttpsResponseLegacy {
     }
 }
 
-function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError, useLegacy: boolean, url) {
+function AFFailure(resolve, reject, task: NSURLSessionTask, error: NSError, useLegacy: boolean, url) {
     if (error.code === -999) {
         return reject(error);
     }
@@ -445,7 +445,7 @@ function bodyToNative(cont) {
     return dict;
 }
 
-const runningRequests: { [k: string]: NSURLSessionDataTask } = {};
+const runningRequests: { [k: string]: NSURLSessionTask } = {};
 
 export function cancelRequest(tag: string) {
     if (runningRequests[tag]) {
@@ -524,7 +524,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
               }
           }
         : null;
-    let task: NSURLSessionDataTask;
+    let task: NSURLSessionTask;
     const tag = opts.tag;
 
     function clearRunningRequest() {
@@ -538,10 +538,11 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
         },
         cancel: () => task && task.cancel(),
         run(resolve, reject) {
-            const success = function (task: NSURLSessionDataTask, data?: any) {
+            const success = function (task: NSURLSessionTask, data?: any) {
                 clearRunningRequest();
                 // TODO: refactor this code with failure one.
-                const contentLength = task.countOfBytesReceived;
+                const contentLength = task?.countOfBytesReceived;
+                console.log('run done', contentLength);
                 const content = useLegacy ? new HttpsResponseLegacy(data, contentLength, opts.url) : getData(data);
                 let getHeaders = () => ({});
                 const sendi = {
@@ -571,7 +572,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                 //     sendi.reason = AFResponse.reason;
                 // }
             };
-            const failure = function (task: NSURLSessionDataTask, error: any) {
+            const failure = function (task: NSURLSessionTask, error: any) {
                 clearRunningRequest();
                 AFFailure(resolve, reject, task, error, useLegacy, opts.url);
             };
@@ -688,7 +689,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                             headers,
                             sizeThreshold,
                             progress,
-                            (dataTask: NSURLSessionDataTask, responseData: any, tempFilePath: string) => {
+                            (dataTask: NSURLSessionTask, responseData: any, tempFilePath: string) => {
                                 clearRunningRequest();
 
                                 const httpResponse = dataTask.response as NSHTTPURLResponse;
@@ -725,7 +726,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                                 }
                                 resolve(sendi);
                             },
-                            (dataTask: NSURLSessionDataTask, error: NSError) => {
+                            (dataTask: NSURLSessionTask, error: NSError) => {
                                 clearRunningRequest();
                                 failure(dataTask, error);
                             }
@@ -808,7 +809,7 @@ export function createRequest(opts: HttpsRequestOptions, useLegacy: boolean = tr
                             clearRunningRequest();
                             if (error) {
                                 // Convert download task to data task for failure handling
-                                const dataTask = task as any as NSURLSessionDataTask;
+                                const dataTask = task as any as NSURLSessionTask;
                                 failure(dataTask, error);
                                 return;
                             }