Merge pull request #60 from kefahB/master

Malformed data due to data.classe() return undefined #57 and fix Content-Type issue with utf-8

Author: EddyVerbruggen

.gitignore

@@ -1,6 +1,7 @@
 .vscode
 .idea
 .DS_Store
+*.history
 *.esm.json
 *.js
 *.js.map

demo/app/assets/httpbin.org.cer

@@ -42,6 +42,23 @@ export function postHttpbin() {
   postRequest('https://httpbin.org/post', {"foo": "bar", "baz": undefined, "plaz": null});
 }
 
+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);
+        });
+  }
+
 export function getHttpbin() {
   getRequest('https://httpbin.org/get');
 }

demo/app/main-page.ts

@@ -9,6 +9,7 @@
         <Button text="GET Httpbin" tap="getHttpbin" class="t-20 btn btn-primary btn-active"/>
         <Button text="GET Httpbin (large response)" tap="getHttpbinLargeResponse" class="t-20 btn btn-primary btn-active"/>
         <Button text="POST Httpbin " tap="postHttpbin" class="t-20 btn btn-primary btn-active"/>
+        <Button text="POST Httpbin UTF-8" tap="postHttpbinWithUTF8" class="t-20 btn btn-primary btn-active"/>
         <Button text="Httpbin Pinning ON" tap="enableSSLPinning" class="t-20 btn btn-primary btn-active"/>
         <Button text="Httpbin Pinning ON, expired cert" tap="enableSSLPinningExpired" class="t-20 btn btn-primary btn-active"/>
         <Button text="Httpbin Pinning OFF" tap="disableSSLPinning" class="t-20 btn btn-primary btn-active"/>

demo/app/main-page.xml

@@ -128,12 +128,18 @@ function getClient(reload: boolean = false, timeout: number = 10): okhttp3.OkHtt
             verify: (hostname: string, session: javax.net.ssl.SSLSession): boolean => {
               let pp = session.getPeerPrincipal().getName();
               let hv = javax.net.ssl.HttpsURLConnection.getDefaultHostnameVerifier();
-              return (
-                  hv.verify(peer.host, session) &&
-                  peer.host === hostname &&
-                  peer.host === session.getPeerHost() &&
-                  pp.indexOf(peer.commonName) !== -1
-              );
+              if (peer.commonName && peer.commonName[0] === "*") {
+                return (hv.verify(peer.host, session) &&
+                    hostname.indexOf(peer.host) > -1 &&
+                    hostname.indexOf(session.getPeerHost()) > -1 &&
+                    pp.indexOf(peer.commonName) !== -1);
+                }
+                else {
+                    return (hv.verify(peer.host, session) &&
+                        peer.host === hostname &&
+                        peer.host === session.getPeerHost() &&
+                        pp.indexOf(peer.host) !== -1);
+                }
             },
           }));
         } catch (error) {

src/https.android.ts

@@ -44,7 +44,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
   let content: any;
   if (data && data.class) {
     // console.log('data.class().name', data.class().name)
-    if (data.enumerateKeysAndObjectsUsingBlock || data.class().name === 'NSArray') {
+    if (data.enumerateKeysAndObjectsUsingBlock || (<any>data) instanceof NSArray) {
       // content = {}
       // data.enumerateKeysAndObjectsUsingBlock(function(k, v) {
       // 	console.log('v.description', v.description)
@@ -53,7 +53,7 @@ function AFSuccess(resolve, task: NSURLSessionDataTask, data: NSDictionary<strin
       let serial = NSJSONSerialization.dataWithJSONObjectOptionsError(data, NSJSONWritingOptions.PrettyPrinted);
       content = NSString.alloc().initWithDataEncoding(serial, NSUTF8StringEncoding).toString();
       // console.log('content', content)
-    } else if (data.class().name === 'NSData') {
+    } else if ((<any>data) instanceof NSData) {
       content = NSString.alloc().initWithDataEncoding(data, NSASCIIStringEncoding).toString();
       // } else if (data.class().name == 'NSArray') {
       // 	content = []
@@ -136,12 +136,10 @@ function AFFailure(resolve, reject, task: NSURLSessionDataTask, error: NSError)
 export function request(opts: Https.HttpsRequestOptions): Promise<Https.HttpsResponse> {
   return new Promise((resolve, reject) => {
     try {
-
       const manager = AFHTTPSessionManager.alloc().initWithBaseURL(NSURL.URLWithString(opts.url));
-
-      if (opts.headers && opts.headers['Content-Type'] === 'application/json') {
-        manager.requestSerializer = AFJSONRequestSerializer.serializer();
-        manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
+      if (opts.headers && (<any>opts.headers['Content-Type']).substring(0, 16) === 'application/json') {
+          manager.requestSerializer = AFJSONRequestSerializer.serializer();
+          manager.responseSerializer = AFJSONResponseSerializer.serializerWithReadingOptions(NSJSONReadingOptions.AllowFragments);
       } else {
         manager.requestSerializer = AFHTTPRequestSerializer.serializer();
         // manager.responseSerializer = AFXMLParserResponseSerializer.serializer()

src/https.ios.ts

@@ -43,7 +43,13 @@
       "name": "Robert Laverty",
       "email": "[email protected]",
       "url": "https://github.com/roblav96"
+    },
+    {
+      "name": "Kefah BADER ALDIN",
+      "email": "[email protected]",
+      "url": "https://github.com/kefahB"
     }
+
   ],
   "repository": "github:gethuman/nativescript-https",
   "homepage": "https://github.com/gethuman/nativescript-https",