release v1.10.2

- update version number

CHANGELOG.md

@@ -1,9 +1,18 @@
 # Changelog
 
+## 1.10.2
+
+- Fixed #78: overriding header "Content-Type" not working on Android
+- Fixed #79: PATCH operation not working on Android API level 19 and older (thanks chax)
+- Fixed #83: App crashes on error during download operation on iOS (thanks troyanskiy)
+- Fixed #76: upload sequence is not respecting order of operations needed by some sites (thanks Johny101)
+
+- :warning: **Deprecation**: AngularJS service is deprecated now and will be removed anytime soon
+
 ## 1.10.1
 
 - Fixed #71: does not encode query string in URL correctly on Android
-- Fixed #72: app crashes if response encoding is not UTF-8
+- Fixed #72: app crashes if response encoding is not UTF-8 (thanks jkfb)
 
 ## 1.10.0
 

README.md

@@ -32,11 +32,17 @@ cordova plugin add cordova-plugin-advanced-http
 
 ## Usage
 
-### Without AngularJS
+### Plain Cordova
 
 This plugin registers a global object located at `cordova.plugin.http`.
 
-### With AngularJS
+### With Ionic-native wrapper
+
+Check the [Ionic docs](https://ionicframework.com/docs/native/http/) for how to use this plugin with Ionic-native.
+
+### With AngularJS (Deprecated)
+
+:warning: *This feature is deprecated and will be removed anytime soon.* :warning:
 
 This plugin creates a cordovaHTTP service inside of a cordovaHTTP module.  You must load the module when you create your app's module.
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-advanced-http",
-  "version": "1.10.1",
+  "version": "1.10.2",
   "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
   "scripts": {
     "testandroid": "./scripts/build-test-app.sh --android --emulator && ./scripts/test-app.sh --android --emulator",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="1.10.1">
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="1.10.2">
   <name>Advanced HTTP plugin</name>
   <description>
         Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning
@@ -56,6 +56,7 @@
       <uses-permission android:name="android.permission.INTERNET"/>
     </config-file>
     <source-file src="src/android/com/github/kevinsawicki/http/HttpRequest.java" target-dir="src/com/github/kevinsawicki/http"/>
+    <source-file src="src/android/com/github/kevinsawicki/http/OkConnectionFactory.java" target-dir="src/com/github/kevinsawicki/http"/>
     <source-file src="src/android/com/github/kevinsawicki/http/TLSSocketFactory.java" target-dir="src/com/github/kevinsawicki/http"/>
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttp.java" target-dir="src/com/synconset/cordovahttp"/>
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDelete.java" target-dir="src/com/synconset/cordovahttp"/>
@@ -67,5 +68,6 @@
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPut.java" target-dir="src/com/synconset/cordovahttp"/>
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPatch.java" target-dir="src/com/synconset/cordovahttp"/>
     <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpUpload.java" target-dir="src/com/synconset/cordovahttp"/>
+    <framework src="com.squareup.okhttp3:okhttp-urlconnection:3.9.1"/>
   </platform>
 </plugin>

scripts/test-app.sh

@@ -3,6 +3,11 @@ set -e
 
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
+if [ $CI == "true" ] && ([ -z $SAUCE_USERNAME ] || [ -z $SAUCE_ACCESS_KEY ]); then
+  echo "Skipping CI tests, because Saucelabs credentials are not set.";
+  exit 0;
+fi
+
 pushd $ROOT
 ./node_modules/.bin/mocha ./test/app-mocha-specs/test.js "$@"
 popd

scripts/upload-artifact.sh

@@ -5,6 +5,11 @@ PLATFORM=$([[ "${@#--android}" = "$@" ]] && echo "ios" || echo "android")
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 TEMP=$ROOT/temp
 
+if [ -z $SAUCE_USERNAME ] || [ -z $SAUCE_ACCESS_KEY ]; then
+  echo "Skipping uploading artifact, because Saucelabs credentials are not set.";
+  exit 0;
+fi
+
 if [ $PLATFORM = "android" ]; then
   curl -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY \
       -X POST \

src/android/com/github/kevinsawicki/http/HttpRequest.java

@@ -428,15 +428,7 @@ public class HttpRequest {
      * A {@link ConnectionFactory} which uses the built-in
      * {@link URL#openConnection()}
      */
-    ConnectionFactory DEFAULT = new ConnectionFactory() {
-      public HttpURLConnection create(URL url) throws IOException {
-        return (HttpURLConnection) url.openConnection();
-      }
-
-      public HttpURLConnection create(URL url, Proxy proxy) throws IOException {
-        return (HttpURLConnection) url.openConnection(proxy);
-      }
-    };
+    ConnectionFactory DEFAULT = new OkConnectionFactory();
   }
 
   private static ConnectionFactory CONNECTION_FACTORY = ConnectionFactory.DEFAULT;

src/android/com/github/kevinsawicki/http/OkConnectionFactory.java

@@ -0,0 +1,26 @@
+package com.github.kevinsawicki.http;
+
+import okhttp3.OkUrlFactory;
+import okhttp3.OkHttpClient;
+
+import java.net.URL;
+import java.net.HttpURLConnection;
+import java.net.URLStreamHandler;
+import java.net.Proxy;
+
+
+public class OkConnectionFactory implements HttpRequest.ConnectionFactory {
+    
+    protected OkHttpClient okHttpClient = new OkHttpClient();
+
+    public HttpURLConnection create(URL url) {
+        OkUrlFactory okUrlFactory = new OkUrlFactory(okHttpClient);
+        return (HttpURLConnection) okUrlFactory.open(url);
+    }
+
+    public HttpURLConnection create(URL url, Proxy proxy) {
+        OkHttpClient okHttpClientWithProxy = okHttpClient.newBuilder().proxy(proxy).build();
+        OkUrlFactory okUrlFactory = new OkUrlFactory(okHttpClientWithProxy);
+        return (HttpURLConnection) okUrlFactory.open(url);
+    }
+}

src/android/com/github/kevinsawicki/http/TLSSocketFactory.java

@@ -11,45 +11,45 @@ import javax.net.ssl.SSLSocketFactory;
 
 public class TLSSocketFactory extends SSLSocketFactory {
 
-    private SSLSocketFactory internalSSLSocketFactory;
+    private SSLSocketFactory delegate;
 
     public TLSSocketFactory(SSLContext context) {
-        internalSSLSocketFactory = context.getSocketFactory();
+        delegate = context.getSocketFactory();
     }
 
     @Override
     public String[] getDefaultCipherSuites() {
-        return internalSSLSocketFactory.getDefaultCipherSuites();
+        return delegate.getDefaultCipherSuites();
     }
 
     @Override
     public String[] getSupportedCipherSuites() {
-        return internalSSLSocketFactory.getSupportedCipherSuites();
+        return delegate.getSupportedCipherSuites();
     }
 
     @Override
     public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
+        return enableTLSOnSocket(delegate.createSocket(s, host, port, autoClose));
     }
 
     @Override
     public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
+        return enableTLSOnSocket(delegate.createSocket(host, port));
     }
 
     @Override
     public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException, UnknownHostException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
+        return enableTLSOnSocket(delegate.createSocket(host, port, localHost, localPort));
     }
 
     @Override
     public Socket createSocket(InetAddress host, int port) throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(host, port));
+        return enableTLSOnSocket(delegate.createSocket(host, port));
     }
 
     @Override
     public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
-        return enableTLSOnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
+        return enableTLSOnSocket(delegate.createSocket(address, port, localAddress, localPort));
     }
 
     private Socket enableTLSOnSocket(Socket socket) {

src/android/com/synconset/cordovahttp/CordovaHttp.java

@@ -52,12 +52,7 @@ abstract class CordovaHttp {
     private CallbackContext callbackContext;
 
     public CordovaHttp(String urlString, Object params, JSONObject headers, int timeout, CallbackContext callbackContext) {
-        this.urlString = urlString;
-        this.params = params;
-        this.serializerName = "default";
-        this.headers = headers;
-        this.timeoutInMilliseconds = timeout;
-        this.callbackContext = callbackContext;
+        this(urlString, params, "default", headers, timeout, callbackContext);
     }
 
     public CordovaHttp(String urlString, Object params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
@@ -149,18 +144,12 @@ abstract class CordovaHttp {
         return request;
     }
 
-    protected HttpRequest setupDataSerializer(HttpRequest request) throws JSONException, Exception {
+    protected void setupDataSerializer(HttpRequest request) throws JSONException, Exception {
       if ("json".equals(this.getSerializerName())) {
           request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
-          request.send(this.getParamsObject().toString());
       } else if ("utf8".equals(this.getSerializerName())) {
           request.contentType("text/plain", request.CHARSET_UTF8);
-          request.send(this.getParamsMap().get("text").toString());
-      } else {
-          request.form(this.getParamsMap());
       }
-
-      return request;
     }
 
     protected void respondWithError(int status, String msg) {
@@ -234,12 +223,23 @@ abstract class CordovaHttp {
     protected void prepareRequest(HttpRequest request) throws HttpRequestException, JSONException {
       this.setupRedirect(request);
       this.setupSecurity(request);
+
       request.readTimeout(this.getRequestTimeout());
       request.acceptCharset(ACCEPTED_CHARSETS);
       request.headers(this.getHeadersMap());
       request.uncompress(true);
     }
 
+    protected void prepareRequestBody(HttpRequest request) throws JSONException, Exception {
+      if ("json".equals(this.getSerializerName())) {
+          request.send(this.getParamsObject().toString());
+      } else if ("utf8".equals(this.getSerializerName())) {
+          request.send(this.getParamsMap().get("text").toString());
+      } else {
+          request.form(this.getParamsMap());
+      }
+    }
+
     private CharsetDecoder createCharsetDecoder(final String charsetName) {
       return Charset.forName(charsetName).newDecoder()
         .onMalformedInput(CodingErrorAction.REPORT)

src/android/com/synconset/cordovahttp/CordovaHttpPatch.java

@@ -25,8 +25,9 @@ class CordovaHttpPatch extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.patch(this.getUrlString());
 
-            this.prepareRequest(request);
             this.setupDataSerializer(request);
+            this.prepareRequest(request);
+            this.prepareRequestBody(request);
             this.returnResponseObject(request);
         } catch (HttpRequestException e) {
             this.handleHttpRequestException(e);

src/android/com/synconset/cordovahttp/CordovaHttpPost.java

@@ -25,8 +25,9 @@ class CordovaHttpPost extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.post(this.getUrlString());
 
-            this.prepareRequest(request);
             this.setupDataSerializer(request);
+            this.prepareRequest(request);
+            this.prepareRequestBody(request);
             this.returnResponseObject(request);
         } catch (HttpRequestException e) {
             this.handleHttpRequestException(e);

src/android/com/synconset/cordovahttp/CordovaHttpPut.java

@@ -25,8 +25,9 @@ class CordovaHttpPut extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.put(this.getUrlString());
 
-            this.prepareRequest(request);
             this.setupDataSerializer(request);
+            this.prepareRequest(request);
+            this.prepareRequestBody(request);
             this.returnResponseObject(request);
         } catch (HttpRequestException e) {
             this.handleHttpRequestException(e);

src/android/com/synconset/cordovahttp/CordovaHttpUpload.java

@@ -54,8 +54,6 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
             MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
             String mimeType = mimeTypeMap.getMimeTypeFromExtension(ext);
 
-            request.part(this.name, filename, mimeType, new File(uri));
-
             Set<?> set = (Set<?>)this.getParamsMap().entrySet();
             Iterator<?> i = set.iterator();
 
@@ -72,6 +70,8 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
                     return;
                 }
             }
+          
+            request.part(this.name, filename, mimeType, new File(uri));
 
             this.returnResponseObject(request);
         } catch (URISyntaxException e) {

src/ios/CordovaHttpPlugin.m

@@ -69,7 +69,9 @@
         [dictionary setValue:response.URL.absoluteString forKey:@"url"];
         [dictionary setObject:[NSNumber numberWithInt:(int)response.statusCode] forKey:@"status"];
         [dictionary setObject:[self copyHeaderFields:response.allHeaderFields] forKey:@"headers"];
-        [dictionary setObject:error.userInfo[AFNetworkingOperationFailingURLResponseBodyKey] forKey:@"error"];
+        if (error.userInfo[AFNetworkingOperationFailingURLResponseBodyKey]) {
+            [dictionary setObject:error.userInfo[AFNetworkingOperationFailingURLResponseBodyKey] forKey:@"error"];
+        }
     } else {
         [dictionary setObject:[self getStatusCode:error] forKey:@"status"];
         [dictionary setObject:[error localizedDescription] forKey:@"error"];
@@ -515,6 +517,7 @@
         } failure:^(NSURLSessionTask *task, NSError *error) {
             NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
             [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+            [dictionary setObject:@"There was an error downloading the file" forKey:@"error"];
 
             CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
             [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];

test/app-test-definitions.js

@@ -1,12 +1,15 @@
 const hooks = {
   onBeforeEachTest: function(done) {
     cordova.plugin.http.clearCookies();
-    cordova.plugin.http.acceptAllCerts(false, done, done);
+    cordova.plugin.http.acceptAllCerts(false, function() {
+      cordova.plugin.http.enableSSLPinning(false, done, done);
+    }, done);
   }
 };
 
 const helpers = {
   acceptAllCerts: function(done) { cordova.plugin.http.acceptAllCerts(true, done, done); },
+  enableSSLPinning: function(done) { cordova.plugin.http.enableSSLPinning(true, done, done); },
   setJsonSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('json')); },
   setUtf8StringSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('utf8')); },
   setUrlEncodedSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('urlencoded')); },
@@ -424,6 +427,43 @@ const tests = [
       result.type.should.be.equal('resolved');
       result.data.data.should.be.equal('');
     }
+  },{
+    description: 'should pin SSL cert correctly (GET)',
+    expected: 'resolved: {"status": 200 ...',
+    before: helpers.enableSSLPinning,
+    func: function(resolve, reject) {
+      cordova.plugin.http.get('https://httpbin.org', {}, {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+    }
+  },{
+    description: 'should send deeply structured JSON object correctly (POST) #65',
+    expected: 'resolved: {"status": 200, "data": "{\\"data\\": \\"{\\\\"outerObj\\\\":{\\\\"innerStr\\\\":\\\\"testString\\\\",\\\\"innerArr\\\\":[1,2,3]}}\\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { outerObj: { innerStr: 'testString', innerArr: [1, 2, 3] }}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).json.should.eql({ outerObj: { innerStr: 'testString', innerArr: [1, 2, 3] }});
+    }
+  },{
+    description: 'should override header "content-type" correctly (POST) #78',
+    expected: 'resolved: {"status": 200, "headers": "{\\"Content-Type\\": \\"text/plain\\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', {}, { 'Content-Type': 'text/plain' }, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).headers['Content-Type'].should.be.equal('text/plain');
+    }
+  },{
+    description: 'should handle error during file download correctly (DOWNLOAD) #83',
+    expected: 'rejected: {"status": 403, "error": "There was an error downloading the file" ...',
+    func: function(resolve, reject) { cordova.plugin.http.downloadFile('http://httpbin.org/status/403', {}, {}, cordova.file.tempDirectory + 'testfile.txt', resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.status.should.be.equal(403);
+      result.data.error.should.be.equal('There was an error downloading the file');
+    }
   }
 ];