Merge branch 'master' into master

Author: EddyVerbruggen

README.md

@@ -17,6 +17,8 @@
 ### The definitive way to hit HTTP based APIs in Nativescript.
 Easily integrate the most reliable native networking libraries with the latest and greatest HTTPS security features.
 
+> Plugin version 2.0.0 bumps `AFNetworking` on iOS to [4.0.0](https://github.com/AFNetworking/AFNetworking/releases/tag/4.0.0) which no longer relies on `UIWebView`. Make sure to run `pod repo update` to get the latest `AFNetworking` pod on your development machine.
+
 #### A drop-in replacement for the [default http module](https://docs.nativescript.org/cookbook/http#get-response-status-code).
 
 ## Features

demo/app/App_Resources/iOS/build.xcconfig

@@ -3,3 +3,5 @@
 // CODE_SIGN_IDENTITY = iPhone Distribution
 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
+
+DEVELOPMENT_TEAM = 8Q5F6M3TNS

demo/app/main-page.ts

@@ -43,21 +43,22 @@ export function postHttpbin() {
 }
 
 export function postHttpbinWithUTF8() {
-    Https.request(
-        {
-          url: 'https://httpbin.org/post',
-          method: 'POST',
-          body: {"foo": "bar", "baz": undefined, "plaz": null},
-          headers: {
-              'Content-Type': "application/json; charset=utf-8"
-          }
-        })
-        .then(response => console.log('Https.request response', response))
-        .catch(error => {
-          console.error('Https.request error', error);
-          dialogs.alert(error);
-        });
-  }
+  Https.request(
+      {
+        url: 'https://httpbin.org/post',
+        method: 'POST',
+        body: {"foo": "bar", "baz": undefined, "plaz": null},
+        headers: {
+          'Content-Type': "application/json; charset=utf-8",
+          'X-testing': "ok"
+        }
+      })
+      .then(response => console.log('Https.request response', response))
+      .catch(error => {
+        console.error('Https.request error', error);
+        dialogs.alert(error);
+      });
+}
 
 export function getHttpbin() {
   getRequest('https://httpbin.org/get');

src/https.ios.ts

@@ -37,7 +37,7 @@ export function disableSSLPinning() {
 
 console.info('nativescript-https > Disabled SSL pinning by default');
 
-function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<string, any> & NSData & NSArray<any>) {
+function AFSuccess(resolve, task: NSURLSessionDataTask, data?: NSDictionary<string, any> & NSData & NSArray<any>) {
   let content = getData(data);
   resolve({task, content});
 }
@@ -110,19 +110,34 @@ export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsRes
 
       manager.requestSerializer.timeoutInterval = opts.timeout ? opts.timeout : 10;
 
-      let methods = {
-        'GET': 'GETParametersSuccessFailure',
-        'POST': 'POSTParametersSuccessFailure',
-        'PUT': 'PUTParametersSuccessFailure',
-        'DELETE': 'DELETEParametersSuccessFailure',
-        'PATCH': 'PATCHParametersSuccessFailure',
-        'HEAD': 'HEADParametersSuccessFailure',
-      };
-      manager[methods[opts.method]](opts.url, dict, function success(task: NSURLSessionDataTask, data: any) {
+      const headers = null;
+
+      const success = (task: NSURLSessionDataTask, data?: any) => {
         AFSuccess(resolve, task, data);
-      }, function failure(task, error) {
+      };
+
+      const failure = (task, error) => {
         AFFailure(resolve, reject, task, error);
-      });
+      };
+
+      const progress = (progress: NSProgress) => {
+        // console.log("Finished?: " + progress.finished);
+      };
+
+      if (opts.method === "GET") {
+        manager.GETParametersHeadersProgressSuccessFailure(opts.url, dict, headers, progress, success, failure);
+      } else if (opts.method === "POST") {
+        manager.POSTParametersHeadersProgressSuccessFailure(opts.url, dict, headers, progress, success, failure);
+      } else if (opts.method === "PUT") {
+        manager.PUTParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
+      } else if (opts.method === "DELETE") {
+        manager.DELETEParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
+      } else if (opts.method === "PATCH") {
+        manager.PATCHParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
+      } else if (opts.method === "HEAD") {
+        manager.HEADParametersHeadersSuccessFailure(opts.url, dict, headers, success, failure);
+      }
+
 
     } catch (error) {
       reject(error);

src/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-https",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Secure HTTP client with SSL pinning for Nativescript - iOS/Android.",
   "main": "https",
   "typings": "index.d.ts",

src/platforms/android/include.gradle

@@ -1,3 +1,3 @@
 dependencies {
-	implementation 'com.squareup.okhttp3:okhttp:3.12.1'
+	implementation 'com.squareup.okhttp3:okhttp:3.14.7'
 }

src/platforms/ios/Podfile

@@ -1 +1 @@
-pod 'AFNetworking', '~> 3.2.1'
+pod 'AFNetworking', '~> 4.0'