release v1.9.1

Add support for Content-Type application/javascript

.editorconfig

@@ -1,16 +1,13 @@
-
 # EditorConfig helps developers define and maintain consistent
 # coding styles between different editors and IDEs
 # editorconfig.org
 
 root = true
 
-
 [*]
-
 # Change these settings to your own preference
 indent_style = space
-indent_size = 4
+indent_size = 2
 
 # We recommend you to keep these unchanged
 end_of_line = lf
@@ -19,4 +16,4 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = false

.gitignore

@@ -1,4 +1,7 @@
 node_modules/**
 tags
 .zedstate
+npm-debug.log
 /temp
+/android-sdk-macosx.zip
+/android-sdk-macosx/**

.travis.yml

@@ -4,7 +4,13 @@ language: objective-c
 os: osx
 osx_image: xcode9.1
 
-cache: false
+env:
+  - TARGET_PLATFORM=android
+  - TARGET_PLATFORM=ios
+
+cache:
+  directories:
+    - node_modules
 
 addons:
   sauce_connect:
@@ -13,26 +19,22 @@ addons:
 
 before_install:
 - export LANG=en_US.UTF-8
-- brew update
 
 install:
 - npm install
-- brew install gradle
-- wget http://dl.google.com/android/android-sdk_r24.4-macosx.zip
-- tar -xvf android-sdk_r24.4-macosx.zip
-- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter platform-tools
-- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter build-tools-25.0.0
-- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter android-25
-- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-support
-- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-m2repository
-- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-google-m2repository
-- export ANDROID_HOME=./android-sdk-macosx
-- export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/23.0.2
+- if [ $TARGET_PLATFORM = "android" ]; then
+    brew update &&
+    brew install gradle &&
+    scripts/setup-android-sdk.sh &&
+    export ANDROID_HOME=$(pwd)/android-sdk-macosx &&
+    export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/23.0.2;
+  fi
 
 script:
-- travis_wait scripts/build-test-app.sh
-- scripts/upload-artifact.sh
-- scripts/test.sh --ios --emulator
+- npm run testjs
+- travis_wait scripts/build-test-app.sh --$TARGET_PLATFORM --emulator &&
+  scripts/upload-artifact.sh --$TARGET_PLATFORM &&
+  scripts/test-app.sh --$TARGET_PLATFORM --emulator;
 
 after_success:
 

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## 1.9.1
+
+- Fixed #45: does not encode arrays correctly as HTTP GET parameter on Android
+- Fixed #54: requests are not responding on iOS with non-string values in header object
+- Fixed #58: white-list of allowed content-types should be removed for iOS
+
+## v1.9.0
+
+- Feature #44: "getCookieString" method is exposed
+- Feature #43: added support for content type "application/javascript" on iOS (thanks wh33ler)
+- Feature #46: "setCookie" allows adding custom cookies
+
+## v1.8.1
+
+- Fixed #27: "uploadFile" method doesn't return data object on iOS (thanks Faisalali23 and laiyinjie)
+- Fixed #40: generic error codes are different on Android and iOS
+
+## v1.8.0
+
+- Feature #33: response object contains response url
+
+## v1.7.1
+
+- Fixed #36: setting basic authentication not working correctly (thanks jkfb)
+- Fixed #35: Android headers are not normalized (not returned in lowercase)
+- Fixed #26: JSON request with array data is not working on Android (JSON error)
+
+## v1.7.0
+
+- Feature #24: "setHeader" allows configuring headers for specified host
+
 ## v1.6.2
 
 - Change #29: removed "validateDomainName" (see info notice)

CONTRIBUTING.md

@@ -0,0 +1,82 @@
+# Contributing to Advanced HTTP Plugin
+
+We'd love for you to contribute to our source code and to make Advanced HTTP even better than it is
+today! Here are the guidelines we'd like you to follow:
+
+ - [Issues and Bugs](#issue)
+ - [Feature Requests](#feature)
+ - [Submission Guidelines](#submit)
+
+## <a name="issue"></a> Found an Issue?
+
+If you find a bug in the source code or a mistake in the documentation, you can help us by
+submitting an issue to our [GitHub Repository](https://github.com/silkimen/cordova-plugin-advanced-http/issues).
+Even better you can submit a Pull Request with a fix.
+
+## <a name="feature"></a> Want a Feature?
+
+You can request a new feature by submitting an issue to our
+[GitHub Repository](https://github.com/silkimen/cordova-plugin-advanced-http/issues).
+If you would like to implement a new feature then consider what kind of change it is:
+
+* **Major Changes** that you wish to contribute to the project should be discussed first so that we
+  can better coordinate our efforts, prevent duplication of work, and help you to craft the change
+  so that it is successfully accepted into the project. Please submit an issue to our GitHub Repository
+  for discussion.
+* **Small Changes** can be crafted and submitted to the GitHub Repository as a Pull Request.
+
+## <a name="submit"></a> Submission Guidelines
+
+### Submitting an Issue
+Before you submit your issue search the archive, maybe your question was already answered.
+
+If your issue appears to be a bug, and hasn't been reported, open a new issue. Help us to maximize
+the effort we can spend fixing issues and adding new features, by not reporting duplicate issues.
+Providing the following information will increase the chances of your issue being dealt with
+quickly:
+
+* **Overview of the Issue** - if an error is being thrown a non-minified stack trace helps
+* **Motivation for or Use Case** - explain why this is a bug for you
+* **Advanced HTTP Version(s)** - is it a regression?
+* **Operating System** - is this a problem with all supported OS or only specific ones?
+* **Related Issues** - has a similar issue been reported before?
+* **Suggest a Fix** - if you can't fix the bug yourself, perhaps you can point to what might be
+  causing the problem (line of code or commit)
+
+**If you get help, help others. Good karma rulez!**
+
+### Submitting a Pull Request
+Before you submit your pull request consider the following guidelines:
+
+* Search [GitHub](https://github.com/silkimen/cordova-plugin-advanced-http/pulls) for an open or
+  closed Pull Request that relates to your submission. You don't want to duplicate effort.
+* Make your changes in a new git branch:
+
+    ```shell
+    git checkout -b my-fix-branch master
+    ```
+* Create your patch
+* Commit your changes using a descriptive commit message
+* Push your branch to GitHub:
+
+    ```shell
+    git push origin my-fix-branch
+    ```
+
+In GitHub, send a pull request to `cordova-plugin-advanced-http:master`.
+If we suggest changes or the [CI build fails](#cibuild), then:
+
+* Make the required updates.
+* Commit your changes to your branch (e.g. `my-fix-branch`).
+* Push the changes to your GitHub repository (this will update your Pull Request).
+
+That's it! Thank you for your contribution!
+
+### <a name="cibuild"></a> Pull Request Feedback
+You can always check the results of the latest CI builds on
+[Travis CI](https://travis-ci.org/silkimen/cordova-plugin-advanced-http/).
+You can use this information to inspect failing tests in your PR.
+
+## Attribution
+This document is adapted from
+[AngularJS' Contribution Guidelines](https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md)

README.md

@@ -24,9 +24,11 @@ Please check [CHANGELOG.md](CHANGELOG.md) for details about updating to a new ve
 The plugin conforms to the Cordova plugin specification, it can be installed
 using the Cordova / Phonegap command line interface.
 
-    phonegap plugin add cordova-plugin-advanced-http
+```shell
+phonegap plugin add cordova-plugin-advanced-http
 
-    cordova plugin add cordova-plugin-advanced-http
+cordova plugin add cordova-plugin-advanced-http
+```
 
 ## Usage
 
@@ -38,7 +40,9 @@ This plugin registers a global object located at `cordova.plugin.http`.
 
 This plugin creates a cordovaHTTP service inside of a cordovaHTTP module.  You must load the module when you create your app's module.
 
-    var app = angular.module('myApp', ['ngRoute', 'ngAnimate', 'cordovaHTTP']);
+```js
+var app = angular.module('myApp', ['ngRoute', 'ngAnimate', 'cordovaHTTP']);
+```
 
 You can then inject the cordovaHTTP service into your controllers.  The functions can then be used identically to the examples shown below except that instead of accepting success and failure callback functions, each function returns a promise.  For more information on promises in AngularJS read the [AngularJS docs](http://docs.angularjs.org/api/ng/service/$q).  For more info on promises in general check out this article on [html5rocks](http://www.html5rocks.com/en/tutorials/es6/promises/).  Make sure that you load cordova.js or phonegap.js after AngularJS is loaded.
 
@@ -48,27 +52,54 @@ You can then inject the cordovaHTTP service into your controllers.  The function
 ### getBasicAuthHeader
 This returns an object representing a basic HTTP Authorization header of the form `{'Authorization': 'Basic base64encodedusernameandpassword'}`
 
-    var header = cordovaHTTP.getBasicAuthHeader("user", "password");
+```js
+var header = cordova.plugin.http.getBasicAuthHeader('user', 'password');
+```
 
 ### useBasicAuth
 This sets up all future requests to use Basic HTTP authentication with the given username and password.
 
-    cordovaHTTP.useBasicAuth("user", "password");
+```js
+cordova.plugin.http.useBasicAuth('user', 'password');
+```
 
 ### setHeader
-Set a header for all future requests.  Takes a header and a value.
+Set a header for all future requests to a specified host. Takes a hostname, a header and a value (must be a string value).
 
-    cordovaHTTP.setHeader("Header", "Value");
+```js
+cordova.plugin.http.setHeader('Hostname', 'Header', 'Value');
+```
+
+You can also define headers used for all hosts by using wildcard character "\*" or providing only two params.
+
+```js
+cordova.plugin.http.setHeader('*', 'Header', 'Value');
+cordova.plugin.http.setHeader('Header', 'Value');
+```
+
+The hostname also includes the port number. If you define a header for `www.example.com` it will not match following URL `http://www.example.com:8080`.
+
+```js
+// will match http://www.example.com/...
+cordova.plugin.http.setHeader('www.example.com', 'Header', 'Value');
+
+// will match http://www.example.com:8080/...
+cordova.plugin.http.setHeader('www.example.com:8080', 'Header', 'Value');
+```
 
 ### disableRedirect
 If set to `true`, it won't follow redirects automatically. This is a global setting.
 
-    cordovaHTTP.disableRedirect(true);
+```js
+cordova.plugin.http.disableRedirect(true);
+```
 
 ### setDataSerializer
-Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.
+Set the data serializer which will be used for all future PATCH, POST and PUT requests. Takes a string representing the name of the serializer.
 
-    cordovaHTTP.setDataSerializer("urlencoded");
+```js
+cordova.plugin.http.setDataSerializer('urlencoded');
+```
 
 You can choose one of these two:
 * `urlencoded`: send data as url encoded content in body (content type "application/x-www-form-urlencoded")
@@ -79,12 +110,30 @@ Caution: `urlencoded` does not support serializing deep structures whereas `json
 ### setRequestTimeout
 Set how long to wait for a request to respond, in seconds.
 
-    cordovaHTTP.setRequestTimeout(5.0);
+```js
+cordova.plugin.http.setRequestTimeout(5.0);
+```
+
+### getCookieString
+Returns saved cookies (as string) matching given URL.
+
+```js
+cordova.plugin.http.getCookieString(url);
+```
+
+### setCookie
+Add a custom cookie. Takes a URL, a cookie string and an options object. See [ToughCookie documentation](https://github.com/salesforce/tough-cookie#setcookiecookieorstring-currenturl-options-cberrcookie) for allowed options.
+
+```js
+cordova.plugin.http.setCookie(url, cookie, options);
+```
 
 ### clearCookies
 Clear the cookie store.
 
-    cordovaHTTP.clearCookies();
+```js
+cordova.plugin.http.clearCookies();
+```
 
 ## Asynchronous Functions
 These functions all take success and error callbacks as their last 2 arguments.
@@ -96,20 +145,24 @@ To use SSL pinning you must include at least one .cer SSL certificate in your ap
 
 As an alternative, you can store your .cer files in the www/certificates folder.
 
-    cordovaHTTP.enableSSLPinning(true, function() {
-        console.log('success!');
-    }, function() {
-        console.log('error :(');
-    });
+```js
+cordova.plugin.http.enableSSLPinning(true, function() {
+  console.log('success!');
+}, function() {
+  console.log('error :(');
+});
+```
 
 ### acceptAllCerts
 Accept all SSL certificates.  Or disable accepting all certificates.  This defaults to false.
 
-    cordovaHTTP.acceptAllCerts(true, function() {
-        console.log('success!');
-    }, function() {
-        console.log('error :(');
-    });
+```js
+cordova.plugin.http.acceptAllCerts(true, function() {
+  console.log('success!');
+}, function() {
+  console.log('error :(');
+});
+```
 
 ### validateDomainName
 This function was removed in v1.6.2. Domain name validation is disabled automatically when you enable "acceptAllCerts".
@@ -117,72 +170,88 @@ This function was removed in v1.6.2. Domain name validation is disabled automati
 ### removeCookies
 Remove all cookies associated with a given URL.
 
-    cordovaHTTP.removeCookies(url);
+```js
+cordova.plugin.http.removeCookies(url, callback);
+```
 
 ### post<a name="post"></a>
 Execute a POST request.  Takes a URL, data, and headers.
 
 #### success
-The success function receives a response object with 3 properties: status, data, and headers.  Status is the HTTP response code. Data is the response from the server as a string. Headers is an object with the headers.  Here's a quick example:
+The success function receives a response object with 3 properties: status, data, and headers.  **status** is the HTTP response code as numeric value. **data** is the response from the server as a string. **headers** is an object with the headers. The keys of the returned object are the header names and the values are the respective header values. All header names are lowercase.
 
-    {
-        status: 200,
-        data: "{'id': 12, 'message': 'test'}",
-        headers: {
-            "Content-Length": "247"
-        }
-    }
+Here's a quick example:
+
+```js
+{
+  status: 200,
+  data: '{"id": 12, "message": "test"}',
+  headers: {
+    'content-length': '247'
+  }
+}
+```
 
 Most apis will return JSON meaning you'll want to parse the data like in the example below:
 
-    cordovaHTTP.post("https://google.com/", {
-        id: 12,
-        message: "test"
-    }, { Authorization: "OAuth2: token" }, function(response) {
-        // prints 200
-        console.log(response.status);
-        try {
-            response.data = JSON.parse(response.data);
-            // prints test
-            console.log(response.data.message);
-        } catch(e) {
-            console.error("JSON parsing error");
-        }
-    }, function(response) {
-        // prints 403
-        console.log(response.status);
-
-        //prints Permission denied
-        console.log(response.error);
-    });
+```js
+cordova.plugin.http.post('https://google.com/', {
+  id: 12,
+  message: 'test'
+}, { Authorization: 'OAuth2: token' }, function(response) {
+  // prints 200
+  console.log(response.status);
+  try {
+    response.data = JSON.parse(response.data);
+    // prints test
+    console.log(response.data.message);
+  } catch(e) {
+    console.error('JSON parsing error');
+  }
+}, function(response) {
+  // prints 403
+  console.log(response.status);
 
+  //prints Permission denied
+  console.log(response.error);
+});
+```
 
 #### failure
-The error function receives a response object with 3 properties: status, error and headers.  Status is the HTTP response code.  Error is the error response from the server as a string.  Headers is an object with the headers.  Here's a quick example:
+The error function receives a response object with 3 properties: status, error and headers.  **status** is the HTTP response code as numeric value. **error** is the error response from the server as a string.  **headers** is an object with the headers. The keys of the returned object are the header names and the values are the respective header values. All header names are lowercase.
 
-    {
-        status: 403,
-        error: "Permission denied",
-        headers: {
-            "Content-Length": "247"
-        }
-    }
+Here's a quick example:
+
+```js
+{
+  status: 403,
+  error: 'Permission denied',
+  headers: {
+    'content-length': '247'
+  }
+}
+```
 
 ### get
 Execute a GET request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
 
-    cordovaHTTP.get("https://google.com/", {
-        id: 12,
-        message: "test"
-    }, { Authorization: "OAuth2: token" }, function(response) {
-        console.log(response.status);
-    }, function(response) {
-        console.error(response.error);
-    });
+```js
+cordova.plugin.http.get('https://google.com/', {
+  id: 12,
+  message: 'test'
+}, { Authorization: 'OAuth2: token' }, function(response) {
+  console.log(response.status);
+}, function(response) {
+  console.error(response.error);
+});
+```
 
 ### put
 Execute a PUT request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
 
+### patch
+Execute a PATCH request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
+
 ### delete
 Execute a DELETE request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
 
@@ -192,37 +261,46 @@ Execute a HEAD request.  Takes a URL, parameters, and headers.  See the [post](#
 ### uploadFile
 Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath, and the name of the parameter to pass the file along as.  See the [post](#post) documentation for details on what is returned on success and failure.
 
-    cordovaHTTP.uploadFile("https://google.com/", {
-        id: 12,
-        message: "test"
-    }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", "picture", function(response) {
-        console.log(response.status);
-    }, function(response) {
-        console.error(response.error);
-    });
+```js
+cordova.plugin.http.uploadFile("https://google.com/", {
+    id: 12,
+    message: 'test'
+}, { Authorization: 'OAuth2: token' }, 'file:///somepicture.jpg', 'picture', function(response) {
+    console.log(response.status);
+}, function(response) {
+    console.error(response.error);
+});
+```
 
 ### downloadFile
 Downloads a file and saves it to the device.  Takes a URL, parameters, headers, and a filePath.  See [post](#post) documentation for details on what is returned on failure.  On success this function returns a cordova [FileEntry object](http://cordova.apache.org/docs/en/3.3.0/cordova_file_file.md.html#FileEntry).
 
-    cordovaHTTP.downloadFile("https://google.com/", {
-        id: 12,
-        message: "test"
-    }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", function(entry) {
-        // prints the filename
-        console.log(entry.name);
+```js
+cordova.plugin.http.downloadFile("https://google.com/", {
+  id: 12,
+  message: 'test'
+}, { Authorization: 'OAuth2: token' }, 'file:///somepicture.jpg', function(entry) {
+  // prints the filename
+  console.log(entry.name);
 
-        // prints the filePath
-        console.log(entry.fullPath);
-    }, function(response) {
-        console.error(response.error);
-    });
+  // prints the filePath
+  console.log(entry.fullPath);
+}, function(response) {
+  console.error(response.error);
+});
+```
 
 
 ## Libraries
 
-This plugin utilizes some awesome open source networking libraries. These are both MIT licensed:
+This plugin utilizes some awesome open source libraries:
 
- - iOS - [AFNetworking](https://github.com/AFNetworking/AFNetworking)
- - Android - [http-request](https://github.com/kevinsawicki/http-request)
+ - iOS - [AFNetworking](https://github.com/AFNetworking/AFNetworking) (MIT licensed)
+ - Android - [http-request](https://github.com/kevinsawicki/http-request) (MIT licensed)
+ - Cookie handling - [tough-cookie](https://github.com/salesforce/tough-cookie) (BSD-3-Clause licensed)
 
-We made a few modifications to both of them.
+We made a few modifications to the networking libraries.
+
+## Contribute & Develop
+
+We've set up a separate document for our [contribution guidelines](CONTRIBUTING.md).

package.json

@@ -1,9 +1,13 @@
 {
   "name": "cordova-plugin-advanced-http",
-  "version": "1.6.2",
+  "version": "1.9.1",
   "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
   "scripts": {
-    "test": "./scripts/build-test-app.sh && ./scripts/test.sh --ios --emulator",
+    "testandroid": "./scripts/build-test-app.sh --android --emulator && ./scripts/test-app.sh --android --emulator",
+    "testios": "./scripts/build-test-app.sh --ios --emulator && ./scripts/test-app.sh --ios --emulator",
+    "testapp": "npm run testandroid && npm run testios",
+    "testjs": "mocha ./test/js-mocha-specs.js",
+    "test": "npm run testjs && npm run testapp",
     "release": "npm run test && ./scripts/release.sh"
   },
   "cordova": {
@@ -53,8 +57,9 @@
     "chai": "4.1.2",
     "chai-as-promised": "7.1.1",
     "colors": "1.1.2",
-    "cordova": "7.0.1",
+    "cordova": "7.1.0",
     "mocha": "4.0.0",
+    "mock-require": "2.0.2",
     "mz": "2.7.0",
     "umd-tough-cookie": "2.3.2",
     "wd": "1.4.1",

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.6.2">
+<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.9.1">
   <name>Advanced HTTP plugin</name>
   <description>
         Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning

scripts/build-test-app.sh

@@ -9,7 +9,7 @@ CDV=$ROOT/node_modules/.bin/cordova
 rm -rf $ROOT/temp
 mkdir $ROOT/temp
 cp -r $ROOT/test/app-template/ $ROOT/temp/
-cp $ROOT/test/test-definitions.js $ROOT/temp/www/js/
+cp $ROOT/test/app-test-definitions.js $ROOT/temp/www/
 cd $ROOT/temp
 $CDV prepare
 $CDV plugins add $ROOT

scripts/setup-android-sdk.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
+curl http://dl.google.com/android/android-sdk_r24.4-macosx.zip -o android-sdk-macosx.zip
+tar -xvf android-sdk-macosx.zip
+
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter platform-tools
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter build-tools-25.0.0
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter android-25
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-support
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-m2repository
+echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-google-m2repository

scripts/test-app.sh

@@ -4,5 +4,5 @@ set -e
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 
 pushd $ROOT
-./node_modules/.bin/mocha ./test/mocha-specs/test.js "$@"
+./node_modules/.bin/mocha ./test/app-mocha-specs/test.js "$@"
 popd

scripts/upload-artifact.sh

@@ -1,16 +1,25 @@
 #!/usr/bin/env bash
 set -e
 
+PLATFORM=$([[ "${@#--android}" = "$@" ]] && echo "ios" || echo "android")
 ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
 TEMP=$ROOT/temp
 
-rm -rf $TEMP/HttpDemo.app.zip
-pushd $TEMP/platforms/ios/build/emulator
-zip -r $TEMP/HttpDemo.app.zip ./HttpDemo.app
-popd
+if [ $PLATFORM = "android" ]; then
+  curl -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY \
+      -X POST \
+      -H "Content-Type: application/octet-stream" \
+      https://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/HttpDemo.apk?overwrite=true \
+      --data-binary @$TEMP/platforms/android/build/outputs/apk/android-debug.apk
+else
+  rm -rf $TEMP/HttpDemo.app.zip
+  pushd $TEMP/platforms/ios/build/emulator
+  zip -r $TEMP/HttpDemo.app.zip ./HttpDemo.app
+  popd
 
-curl -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY \
-    -X POST \
-    -H "Content-Type: application/octet-stream" \
-    https://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/HttpDemo.app.zip?overwrite=true \
-    --data-binary @$TEMP/HttpDemo.app.zip
+  curl -u $SAUCE_USERNAME:$SAUCE_ACCESS_KEY \
+      -X POST \
+      -H "Content-Type: application/octet-stream" \
+      https://saucelabs.com/rest/v1/storage/$SAUCE_USERNAME/HttpDemo.app.zip?overwrite=true \
+      --data-binary @$TEMP/HttpDemo.app.zip
+fi

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

@@ -6,8 +6,15 @@ package com.synconset.cordovahttp;
 import org.apache.cordova.CallbackContext;
 
 import org.json.JSONException;
+import org.json.JSONArray;
 import org.json.JSONObject;
 
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -17,6 +24,7 @@ import java.util.Iterator;
 import android.text.TextUtils;
 
 import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 abstract class CordovaHttp {
     protected static final String TAG = "CordovaHTTP";
@@ -28,13 +36,13 @@ abstract class CordovaHttp {
     private static AtomicBoolean disableRedirect = new AtomicBoolean(false);
 
     private String urlString;
-    private JSONObject params;
+    private Object params;
     private String serializerName;
     private JSONObject headers;
     private int timeoutInMilliseconds;
     private CallbackContext callbackContext;
 
-    public CordovaHttp(String urlString, JSONObject params, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttp(String urlString, Object params, JSONObject headers, int timeout, CallbackContext callbackContext) {
         this.urlString = urlString;
         this.params = params;
         this.serializerName = "default";
@@ -43,7 +51,7 @@ abstract class CordovaHttp {
         this.callbackContext = callbackContext;
     }
 
-    public CordovaHttp(String urlString, JSONObject params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttp(String urlString, Object params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
         this.urlString = urlString;
         this.params = params;
         this.serializerName = serializerName;
@@ -78,7 +86,7 @@ abstract class CordovaHttp {
         return this.urlString;
     }
 
-    protected JSONObject getParamsObject() {
+    protected Object getParamsObject() {
         return this.params;
     }
 
@@ -86,8 +94,12 @@ abstract class CordovaHttp {
         return this.serializerName;
     }
 
-    protected HashMap<String, Object> getParamsMap() throws JSONException {
-        return this.getMapFromJSONObject(this.params);
+    protected HashMap<String, Object> getParamsMap() throws JSONException, Exception {
+        if (this.params instanceof JSONObject) {
+          return this.getMapFromJSONObject((JSONObject) this.params);
+        } else {
+          throw new Exception("unsupported params type, needs to be a JSON object");
+        }
     }
 
     protected JSONObject getHeadersObject() {
@@ -116,6 +128,7 @@ abstract class CordovaHttp {
         if (sslPinning.get()) {
             request.pinToCerts();
         }
+
         return request;
     }
 
@@ -123,9 +136,21 @@ abstract class CordovaHttp {
         if (disableRedirect.get()) {
             request.followRedirects(false);
         }
+
         return request;
     }
 
+    protected HttpRequest setupDataSerializer(HttpRequest request) throws JSONException, Exception {
+      if (new String("json").equals(this.getSerializerName())) {
+          request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
+          request.send(this.getParamsObject().toString());
+      } else {
+          request.form(this.getParamsMap());
+      }
+
+      return request;
+    }
+
     protected void respondWithError(int status, String msg) {
         try {
             JSONObject response = new JSONObject();
@@ -138,7 +163,7 @@ abstract class CordovaHttp {
     }
 
     protected void respondWithError(String msg) {
-        this.respondWithError(500, msg);
+        this.respondWithError(-1, msg);
     }
 
     protected void addResponseHeaders(HttpRequest request, JSONObject response) throws JSONException {
@@ -150,7 +175,7 @@ abstract class CordovaHttp {
             List<String> value = entry.getValue();
 
             if ((key != null) && (!value.isEmpty())) {
-                filteredHeaders.put(key, TextUtils.join(", ", value));
+                filteredHeaders.put(key.toLowerCase(), TextUtils.join(", ", value));
             }
         }
 
@@ -168,14 +193,72 @@ abstract class CordovaHttp {
         return map;
     }
 
+    protected ArrayList<Object> getListFromJSONArray(JSONArray array) throws JSONException {
+      ArrayList<Object> list = new ArrayList<Object>();
+
+      for (int i = 0; i < array.length(); i++) {
+          list.add(array.get(i));
+      }
+      return list;
+    }
+
     protected HashMap<String, Object> getMapFromJSONObject(JSONObject object) throws JSONException {
         HashMap<String, Object> map = new HashMap<String, Object>();
         Iterator<?> i = object.keys();
 
         while(i.hasNext()) {
             String key = (String)i.next();
-            map.put(key, object.get(key));
+            Object value = object.get(key);
+
+            if (value instanceof JSONArray) {
+                map.put(key, getListFromJSONArray((JSONArray)value));
+            } else {
+                map.put(key, object.get(key));
+            }
         }
         return map;
     }
+
+    protected void prepareRequest(HttpRequest request) throws HttpRequestException, JSONException {
+      this.setupRedirect(request);
+      this.setupSecurity(request);
+      request.readTimeout(this.getRequestTimeout());
+      request.acceptCharset(CHARSET);
+      request.headers(this.getHeadersMap());
+      request.uncompress(true);
+    }
+
+    protected void returnResponseObject(HttpRequest request) throws HttpRequestException {
+      try {
+        JSONObject response = new JSONObject();
+        int code = request.code();
+        String body = request.body(CHARSET);
+
+        response.put("status", code);
+        response.put("url", request.url().toString());
+        this.addResponseHeaders(request, response);
+
+        if (code >= 200 && code < 300) {
+            response.put("data", body);
+            this.getCallbackContext().success(response);
+        } else {
+            response.put("error", body);
+            this.getCallbackContext().error(response);
+        }
+      } catch(JSONException e) {
+        this.respondWithError("There was an error generating the response");
+      }
+    }
+
+    protected void handleHttpRequestException(HttpRequestException e) {
+      if (e.getCause() instanceof UnknownHostException) {
+          this.respondWithError(0, "The host could not be resolved");
+      } else if (e.getCause() instanceof SocketTimeoutException) {
+          this.respondWithError(1, "The request timed out");
+      } else if (e.getCause() instanceof SSLHandshakeException) {
+          this.respondWithError("SSL handshake failed");
+      } else {
+          this.respondWithError("There was an error with the request: " + e.getMessage());
+      }
+    }
 }

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

@@ -17,7 +17,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 class CordovaHttpDelete extends CordovaHttp implements Runnable {
-    public CordovaHttpDelete(String urlString, JSONObject data, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpDelete(String urlString, Object data, JSONObject headers, int timeout, CallbackContext callbackContext) {
         super(urlString, data, headers, timeout, callbackContext);
     }
 
@@ -57,8 +57,10 @@ class CordovaHttpDelete extends CordovaHttp implements Runnable {
             } else if (e.getCause() instanceof SSLHandshakeException) {
                 this.respondWithError("SSL handshake failed");
             } else {
-                this.respondWithError("There was an error with the request");
+                this.respondWithError("There was an error with the request: " + e.getMessage());
             }
+        } catch (Exception e) {
+          this.respondWithError(-1, e.getMessage());
         }
     }
 }

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

@@ -23,7 +23,7 @@ import org.json.JSONObject;
 class CordovaHttpDownload extends CordovaHttp implements Runnable {
     private String filePath;
 
-    public CordovaHttpDownload(String urlString, JSONObject params, JSONObject headers, String filePath, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpDownload(String urlString, Object params, JSONObject headers, String filePath, int timeout, CallbackContext callbackContext) {
         super(urlString, params, headers, timeout, callbackContext);
         this.filePath = filePath;
     }
@@ -33,17 +33,15 @@ class CordovaHttpDownload extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), true);
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
-            int code = request.code();
+            this.prepareRequest(request);
 
             JSONObject response = new JSONObject();
-            this.addResponseHeaders(request, response);
+            int code = request.code();
+
             response.put("status", code);
+            response.put("url", request.url().toString());
+            this.addResponseHeaders(request, response);
+
             if (code >= 200 && code < 300) {
                 URI uri = new URI(filePath);
                 File file = new File(uri);
@@ -60,15 +58,9 @@ class CordovaHttpDownload extends CordovaHttp implements Runnable {
         } catch (JSONException e) {
             this.respondWithError("There was an error generating the response");
         } catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+          this.respondWithError(e.getMessage());
         }
     }
 }

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

@@ -17,7 +17,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 class CordovaHttpGet extends CordovaHttp implements Runnable {
-    public CordovaHttpGet(String urlString, JSONObject params, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpGet(String urlString, Object params, JSONObject headers, int timeout, CallbackContext callbackContext) {
         super(urlString, params, headers, timeout, callbackContext);
     }
 
@@ -26,39 +26,12 @@ class CordovaHttpGet extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.get(this.getUrlString(), this.getParamsMap(), false);
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
-
-            int code = request.code();
-            String body = request.body(CHARSET);
-            JSONObject response = new JSONObject();
-
-            this.addResponseHeaders(request, response);
-            response.put("status", code);
-
-            if (code >= 200 && code < 300) {
-                response.put("data", body);
-                this.getCallbackContext().success(response);
-            } else {
-                response.put("error", body);
-                this.getCallbackContext().error(response);
-            }
-        } catch (JSONException e) {
-            this.respondWithError("There was an error generating the response");
+            this.prepareRequest(request);
+            this.returnResponseObject(request);
         } catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+            this.respondWithError(e.getMessage());
         }
     }
 }

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

@@ -16,7 +16,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 class CordovaHttpHead extends CordovaHttp implements Runnable {
-    public CordovaHttpHead(String urlString, JSONObject params, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpHead(String urlString, Object params, JSONObject headers, int timeout, CallbackContext callbackContext) {
         super(urlString, params, headers, timeout, callbackContext);
     }
 
@@ -25,39 +25,12 @@ class CordovaHttpHead extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.head(this.getUrlString(), this.getParamsMap(), true);
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
-
-            int code = request.code();
-            JSONObject response = new JSONObject();
-
-            this.addResponseHeaders(request, response);
-            response.put("status", code);
-
-            if (code >= 200 && code < 300) {
-                // no 'body' to return for HEAD request
-                this.getCallbackContext().success(response);
-            } else {
-                String body = request.body(CHARSET);
-                response.put("error", body);
-                this.getCallbackContext().error(response);
-            }
-        } catch (JSONException e) {
-            this.respondWithError("There was an error generating the response");
+            this.prepareRequest(request);
+            this.returnResponseObject(request);
         } catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+            this.respondWithError(e.getMessage());
         }
     }
 }

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

@@ -16,7 +16,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 class CordovaHttpPatch extends CordovaHttp implements Runnable {
-    public CordovaHttpPatch(String urlString, JSONObject params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpPatch(String urlString, Object params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
         super(urlString, params, serializerName, headers, timeout, callbackContext);
     }
 
@@ -25,46 +25,13 @@ class CordovaHttpPatch extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.patch(this.getUrlString());
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
-
-            if (new String("json").equals(this.getSerializerName())) {
-                request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
-                request.send(this.getParamsObject().toString());
-            } else {
-                request.form(this.getParamsMap());
-            }
-
-            int code = request.code();
-            String body = request.body(CHARSET);
-            JSONObject response = new JSONObject();
-
-            this.addResponseHeaders(request, response);
-            response.put("status", code);
-
-            if (code >= 200 && code < 300) {
-                response.put("data", body);
-                this.getCallbackContext().success(response);
-            } else {
-                response.put("error", body);
-                this.getCallbackContext().error(response);
-            }
-        } catch (JSONException e) {
-            this.respondWithError("There was an error generating the response");
+            this.prepareRequest(request);
+            this.setupDataSerializer(request);
+            this.returnResponseObject(request);
         } catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+            this.respondWithError(e.getMessage());
         }
     }
 }

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

@@ -36,7 +36,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
     public boolean execute(String action, final JSONArray args, final CallbackContext callbackContext) throws JSONException {
         if (action.equals("post")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             String serializerName = args.getString(2);
             JSONObject headers = args.getJSONObject(3);
             int timeoutInMilliseconds = args.getInt(4) * 1000;
@@ -45,7 +45,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             cordova.getThreadPool().execute(post);
         } else if (action.equals("get")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             JSONObject headers = args.getJSONObject(2);
             int timeoutInMilliseconds = args.getInt(3) * 1000;
             CordovaHttpGet get = new CordovaHttpGet(urlString, params, headers, timeoutInMilliseconds, callbackContext);
@@ -53,7 +53,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             cordova.getThreadPool().execute(get);
         } else if (action.equals("put")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             String serializerName = args.getString(2);
             JSONObject headers = args.getJSONObject(3);
             int timeoutInMilliseconds = args.getInt(4) * 1000;
@@ -62,7 +62,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             cordova.getThreadPool().execute(put);
         } else if (action.equals("patch")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             String serializerName = args.getString(2);
             JSONObject headers = args.getJSONObject(3);
             int timeoutInMilliseconds = args.getInt(4) * 1000;
@@ -72,7 +72,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
         }
          else if (action.equals("delete")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             JSONObject headers = args.getJSONObject(2);
             int timeoutInMilliseconds = args.getInt(3) * 1000;
             CordovaHttpDelete delete = new CordovaHttpDelete(urlString, params, headers, timeoutInMilliseconds, callbackContext);
@@ -80,7 +80,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             cordova.getThreadPool().execute(delete);
         } else if (action.equals("head")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             JSONObject headers = args.getJSONObject(2);
             int timeoutInMilliseconds = args.getInt(3) * 1000;
             CordovaHttpHead head = new CordovaHttpHead(urlString, params, headers, timeoutInMilliseconds, callbackContext);
@@ -103,7 +103,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             callbackContext.success();
         } else if (action.equals("uploadFile")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             JSONObject headers = args.getJSONObject(2);
             String filePath = args.getString(3);
             String name = args.getString(4);
@@ -113,7 +113,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
             cordova.getThreadPool().execute(upload);
         } else if (action.equals("downloadFile")) {
             String urlString = args.getString(0);
-            JSONObject params = args.getJSONObject(1);
+            Object params = args.get(1);
             JSONObject headers = args.getJSONObject(2);
             String filePath = args.getString(3);
             int timeoutInMilliseconds = args.getInt(4) * 1000;

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

@@ -16,7 +16,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 class CordovaHttpPost extends CordovaHttp implements Runnable {
-    public CordovaHttpPost(String urlString, JSONObject params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpPost(String urlString, Object params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
         super(urlString, params, serializerName, headers, timeout, callbackContext);
     }
 
@@ -25,46 +25,13 @@ class CordovaHttpPost extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.post(this.getUrlString());
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
-
-            if (new String("json").equals(this.getSerializerName())) {
-                request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
-                request.send(this.getParamsObject().toString());
-            } else {
-                request.form(this.getParamsMap());
-            }
-
-            int code = request.code();
-            String body = request.body(CHARSET);
-            JSONObject response = new JSONObject();
-
-            this.addResponseHeaders(request, response);
-            response.put("status", code);
-
-            if (code >= 200 && code < 300) {
-                response.put("data", body);
-                this.getCallbackContext().success(response);
-            } else {
-                response.put("error", body);
-                this.getCallbackContext().error(response);
-            }
-        } catch (JSONException e) {
-            this.respondWithError("There was an error generating the response");
+            this.prepareRequest(request);
+            this.setupDataSerializer(request);
+            this.returnResponseObject(request);
         } catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+            this.respondWithError(e.getMessage());
         }
     }
 }

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

@@ -16,7 +16,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
 
 class CordovaHttpPut extends CordovaHttp implements Runnable {
-    public CordovaHttpPut(String urlString, JSONObject data, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpPut(String urlString, Object data, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
         super(urlString, data, serializerName, headers, timeout, callbackContext);
     }
 
@@ -25,46 +25,13 @@ class CordovaHttpPut extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.put(this.getUrlString());
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
-
-            if (new String("json").equals(this.getSerializerName())) {
-                request.contentType(request.CONTENT_TYPE_JSON, request.CHARSET_UTF8);
-                request.send(this.getParamsObject().toString());
-            } else {
-                request.form(this.getParamsMap());
-            }
-
-            int code = request.code();
-            String body = request.body(CHARSET);
-            JSONObject response = new JSONObject();
-
-            this.addResponseHeaders(request, response);
-            response.put("status", code);
-
-            if (code >= 200 && code < 300) {
-                response.put("data", body);
-                this.getCallbackContext().success(response);
-            } else {
-                response.put("error", body);
-                this.getCallbackContext().error(response);
-            }
-        } catch (JSONException e) {
-            this.respondWithError("There was an error generating the response");
-        }  catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+            this.prepareRequest(request);
+            this.setupDataSerializer(request);
+            this.returnResponseObject(request);
+        } catch (HttpRequestException e) {
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+            this.respondWithError(e.getMessage());
         }
     }
 }

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

@@ -30,7 +30,7 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
     private String filePath;
     private String name;
 
-    public CordovaHttpUpload(String urlString, JSONObject params, JSONObject headers, String filePath, String name, int timeout, CallbackContext callbackContext) {
+    public CordovaHttpUpload(String urlString, Object params, JSONObject headers, String filePath, String name, int timeout, CallbackContext callbackContext) {
         super(urlString, params, headers, timeout, callbackContext);
         this.filePath = filePath;
         this.name = name;
@@ -41,12 +41,7 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
         try {
             HttpRequest request = HttpRequest.post(this.getUrlString());
 
-            request.readTimeout(this.getRequestTimeout());
-            this.setupRedirect(request);
-            this.setupSecurity(request);
-            request.acceptCharset(CHARSET);
-            request.headers(this.getHeadersMap());
-            request.uncompress(true);
+            this.prepareRequest(request);
 
             URI uri = new URI(filePath);
 
@@ -78,35 +73,15 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
                 }
             }
 
-            int code = request.code();
-            String body = request.body(CHARSET);
-
-            JSONObject response = new JSONObject();
-
-            this.addResponseHeaders(request, response);
-            response.put("status", code);
-
-            if (code >= 200 && code < 300) {
-                response.put("data", body);
-                this.getCallbackContext().success(response);
-            } else {
-                response.put("error", body);
-                this.getCallbackContext().error(response);
-            }
+            this.returnResponseObject(request);
         } catch (URISyntaxException e) {
             this.respondWithError("There was an error loading the file");
         } catch (JSONException e) {
             this.respondWithError("There was an error generating the response");
-        }  catch (HttpRequestException e) {
-            if (e.getCause() instanceof UnknownHostException) {
-                this.respondWithError(0, "The host could not be resolved");
-            } else if (e.getCause() instanceof SocketTimeoutException) {
-                this.respondWithError(1, "The request timed out");
-            } else if (e.getCause() instanceof SSLHandshakeException) {
-                this.respondWithError("SSL handshake failed");
-            } else {
-                this.respondWithError("There was an error with the request");
-            }
+        } catch (HttpRequestException e) {
+            this.handleHttpRequestException(e);
+        } catch (Exception e) {
+          this.respondWithError(e.getMessage());
         }
     }
 }

src/ios/CordovaHttpPlugin.m

@@ -51,6 +51,7 @@
 
 - (void)handleSuccess:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response andData:(id)data {
     if (response != nil) {
+        [dictionary setValue:response.URL.absoluteString forKey:@"url"];
         [dictionary setObject:[NSNumber numberWithInt:response.statusCode] forKey:@"status"];
         [dictionary setObject:[self copyHeaderFields:response.allHeaderFields] forKey:@"headers"];
     }
@@ -62,6 +63,7 @@
 
 - (void)handleError:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response error:(NSError*)error {
     if (response != nil) {
+        [dictionary setValue:response.URL.absoluteString forKey:@"url"];
         [dictionary setObject:[NSNumber numberWithInt:response.statusCode] forKey:@"status"];
         [dictionary setObject:[self copyHeaderFields:response.allHeaderFields] forKey:@"headers"];
         [dictionary setObject:[[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding] forKey:@"error"];
@@ -364,7 +366,7 @@
         }
     } progress:nil success:^(NSURLSessionTask *task, id responseObject) {
         NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];
+        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
 
         CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
         [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];

src/ios/TextResponseSerializer.m

@@ -19,11 +19,12 @@ static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger co
 
 - (instancetype)init {
     self = [super init];
+
     if (!self) {
         return nil;
     }
 
-    self.acceptableContentTypes = [NSSet setWithObjects:@"text/plain", @"text/html", @"text/json", @"application/hal+json", @"application/json", @"text/xml", @"application/xml", @"text/css", nil];
+    self.acceptableContentTypes = nil;
 
     return self;
 }

test/app-mocha-specs/test.js

@@ -4,22 +4,25 @@ const wd = require('wd');
 const apps = require('./helpers/apps');
 const caps = Object.assign({}, require('./helpers/caps'));
 const serverConfig = require('./helpers/server');
-const testDefinitions = require('../test-definitions');
+const testDefinitions = require('../app-test-definitions');
 const pkgjson = require('../../package.json');
 
 describe('Advanced HTTP', function() {
-  let driver;
+  const isDevice = process.argv.includes('--device');
+  const isAndroid = process.argv.includes('--android');
+  const targetInfo = { isDevice, isAndroid };
+
+  let driver = null;
   let allPassed = true;
 
   this.timeout(900000);
 
   const getCaps = appName => {
-    const isDevice = process.argv.includes('--device');
-    const isAndroid = process.argv.includes('--android');
-    const desiredCaps = caps[(isAndroid ? 'android' : 'ios') + (isDevice ? 'Device' : 'Emulator')];
-    const desiredApp = apps[(isAndroid ? 'android' : 'ios') + appName];
+    const desiredOs = isAndroid ? 'android' : 'ios';
+    const desiredCaps = caps[desiredOs + (isDevice ? 'Device' : 'Emulator')];
+    const desiredApp = apps[desiredOs + appName];
 
-    desiredCaps.name = pkgjson.name;
+    desiredCaps.name = pkgjson.name + ` (${desiredOs})`;
     desiredCaps.app = desiredApp;
 
     return desiredCaps;
@@ -37,10 +40,27 @@ describe('Advanced HTTP', function() {
     .then(text => text.match(/\d+:\ (.*)/)[1])
     .should.eventually.become(testTitle, 'Test description is not matching!');
 
-  const validateResult = text => driver
-    .elementById('resultTextarea')
-    .getAttribute('value')
-    .should.eventually.include(text);
+  const waitToBeFinished = timeout => new Promise((resolve, reject) => {
+    const timeoutTimestamp = Date.now() + timeout;
+    const checkIfFinished = () => driver
+      .elementById('statusInput')
+      .getValue()
+      .then(value => {
+        if (value === 'finished') {
+          resolve();
+        } else if (Date.now() > timeoutTimestamp) {
+          reject('Test function timed out!');
+        } else {
+          setTimeout(checkIfFinished, 500);
+        }
+      });
+
+    checkIfFinished();
+  });
+
+  const validateResult = testDefinition => driver
+    .safeExecute('app.lastResult')
+    .then(result => testDefinition.validationFunc(driver, result, targetInfo));
 
   const clickNext = () => driver
     .elementById('nextBtn')
@@ -67,7 +87,8 @@ describe('Advanced HTTP', function() {
       return clickNext()
         .then(() => validateTestIndex(index))
         .then(() => validateTestTitle(this.test.title))
-        .then(() => validateResult(definition.expected))
+        .then(() => waitToBeFinished(definition.timeout || 10000))
+        .then(() => validateResult(definition))
       });
   });
 });

test/app-template/config.xml

@@ -24,4 +24,5 @@
     </platform>
     <engine name="android" spec="6.2.3" />
     <engine name="ios" spec="4.4.0" />
+    <plugin name="cordova-plugin-file" spec="4.3.3" />
 </widget>

test/app-template/www/index.css

@@ -15,9 +15,19 @@ body {
 
 button, input, textarea {
   display: block;
+  box-sizing: border-box;
   width: 100%;
 }
 
+button {
+  height: 2.5em;
+  font-size: 10pt;
+}
+
+input {
+  text-align: center;
+}
+
 h1 {
   font-size: 12pt;
   text-align: center;

test/app-template/www/index.html

@@ -5,16 +5,17 @@
         <meta name="format-detection" content="telephone=no">
         <meta name="msapplication-tap-highlight" content="no">
         <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
-        <link rel="stylesheet" type="text/css" href="css/index.css">
+        <link rel="stylesheet" type="text/css" href="index.css">
     </head>
     <body>
         <h1 id="descriptionLbl">Advanced HTTP test suite</h1>
-        <textarea rows="16" cols="50" id="expectedTextarea">Click next to run first test.</textarea>
-        <textarea rows="16" cols="50" id="resultTextarea"></textarea>
+        <input value="idle" id="statusInput" readonly></input>
+        <textarea rows="16" cols="50" id="expectedTextarea" readonly>Click next to run first test.</textarea>
+        <textarea rows="16" cols="50" id="resultTextarea" readonly></textarea>
         <button id="nextBtn">Run next test</button>
 
         <script type="text/javascript" src="cordova.js"></script>
-        <script type="text/javascript" src="js/test-definitions.js"></script>
-        <script type="text/javascript" src="js/index.js"></script>
+        <script type="text/javascript" src="app-test-definitions.js"></script>
+        <script type="text/javascript" src="index.js"></script>
     </body>
 </html>

test/app-template/www/index.js

@@ -1,6 +1,8 @@
 const app = {
   testIndex: -1,
 
+  lastResult: null,
+
   initialize: function() {
     document.getElementById('nextBtn').addEventListener('click', app.onNextBtnClick);
   },
@@ -12,11 +14,37 @@ const app = {
   },
 
   reject: function(content) {
+    document.getElementById('statusInput').value = 'finished';
     app.printResult('result - rejected', content);
+
+    app.lastResult = {
+      type: 'rejected',
+      data: content
+    };
   },
 
   resolve: function(content) {
+    document.getElementById('statusInput').value = 'finished';
     app.printResult('result - resolved', content);
+
+    app.lastResult = {
+      type: 'resolved',
+      data: content
+    };
+  },
+
+  throw: function(error) {
+    document.getElementById('statusInput').value = 'finished';
+    app.printResult('result - throwed', error.message);
+
+    app.lastResult = {
+      type: 'throwed',
+      message: error.message
+    };
+  },
+
+  getResult: function(cb) {
+    cb(app.lastResult);
   },
 
   runTest: function(index) {
@@ -24,13 +52,21 @@ const app = {
     const titleText = app.testIndex + ': ' + testDefinition.description;
     const expectedText = 'expected - ' + testDefinition.expected;
 
+    document.getElementById('statusInput').value = 'running';
     document.getElementById('expectedTextarea').value = expectedText;
     document.getElementById('resultTextarea').value = '';
     document.getElementById('descriptionLbl').innerText = titleText;
-    testDefinition.func(app.resolve, app.reject);
+
+    try {
+      testDefinition.func(app.resolve, app.reject);
+    } catch (error) {
+      app.throw(error);
+    }
   },
 
   onBeforeTest: function(testIndex, cb) {
+    app.lastResult = null;
+
     if (hooks && hooks.onBeforeEachTest) {
       return hooks.onBeforeEachTest(function() {
         const testDefinition = tests[testIndex];

test/app-test-definitions.js

@@ -0,0 +1,390 @@
+const hooks = {
+  onBeforeEachTest: function(done) {
+    cordova.plugin.http.clearCookies();
+    cordova.plugin.http.acceptAllCerts(false, done, done);
+  }
+};
+
+const helpers = {
+  acceptAllCerts: function(done) { cordova.plugin.http.acceptAllCerts(true, done, done); },
+  setJsonSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('json')); },
+  setUrlEncodedSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('urlencoded')); },
+  getWithXhr: function(done, url) {
+    var xhr = new XMLHttpRequest();
+
+    xhr.addEventListener('load', function() {
+      done(this.responseText);
+    });
+
+    xhr.open('GET', url);
+    xhr.send();
+  },
+  writeToFile: function (done, fileName, content) {
+    window.resolveLocalFileSystemURL(cordova.file.cacheDirectory, function (directoryEntry) {
+      directoryEntry.getFile(fileName, { create: true, exclusive: false }, function (fileEntry) {
+        fileEntry.createWriter(function (fileWriter) {
+          var blob = new Blob([ content ], { type: 'text/plain' });
+
+          fileWriter.onwriteend = done;
+          fileWriter.onerror = done;
+          fileWriter.write(blob);
+        }, done);
+      }, done);
+    }, done);
+  }
+};
+
+const tests = [
+  {
+    description: 'should reject self signed cert (GET)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result, targetInfo) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error: targetInfo.isAndroid ? 'SSL handshake failed' : 'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (PUT)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result, targetInfo) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error: targetInfo.isAndroid ? 'SSL handshake failed' : 'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (POST)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result, targetInfo) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error: targetInfo.isAndroid ? 'SSL handshake failed' : 'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (PATCH)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result, targetInfo) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error: targetInfo.isAndroid ? 'SSL handshake failed' : 'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (DELETE)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result, targetInfo) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error: targetInfo.isAndroid ? 'SSL handshake failed' : 'cancelled' });
+    }
+  },{
+    description: 'should accept bad cert (GET)',
+    expected: 'resolved: {"status":200, ...',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.should.include({ status: 200 });
+    }
+  },{
+    description: 'should accept bad cert (PUT)',
+    expected: 'rejected: {"status":405, ... // will be rejected because PUT is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should accept bad cert (POST)',
+    expected: 'rejected: {"status":405, ... // will be rejected because POST is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should accept bad cert (PATCH)',
+    expected: 'rejected: {"status":405, ... // will be rejected because PATCH is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should accept bad cert (DELETE)',
+    expected: 'rejected: {"status":405, ... // will be rejected because DELETE is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should fetch data from http://httpbin.org/ (GET)',
+    expected: 'resolved: {"status":200, ...',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.get('http://httpbin.org/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.should.include({ status: 200 });
+    }
+  },{
+    description: 'should send JSON object correctly (POST)',
+    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
+    }
+  },{
+    description: 'should send JSON object correctly (PUT)',
+    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
+    }
+  },{
+    description: 'should send JSON object correctly (PATCH)',
+    expected: 'resolved: {"status": 200, "data": "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
+    }
+  },{
+    description: 'should send JSON array correctly (POST) #26',
+    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', [ 1, 2, 3 ], {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).json.should.eql([ 1, 2, 3 ]);
+    }
+  },{
+    description: 'should send JSON array correctly (PUT) #26',
+    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', [ 1, 2, 3 ], {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).json.should.eql([ 1, 2, 3 ]);
+    }
+  },{
+    description: 'should send JSON array correctly (PATCH) #26',
+    expected: 'resolved: {"status": 200, "data": "[ 1, 2, 3 ]\" ...',
+    before: helpers.setJsonSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', [ 1, 2, 3 ], {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.data.should.be.a('string');
+      JSON.parse(result.data.data).json.should.eql([ 1, 2, 3 ]);
+    }
+  },{
+    description: 'should send url encoded data correctly (POST) #41',
+    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
+    before: helpers.setUrlEncodedSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.post('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).form.should.eql({ test: 'testString' });
+    }
+  },{
+    description: 'should send url encoded data correctly (PUT)',
+    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
+    before: helpers.setUrlEncodedSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.put('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).form.should.eql({ test: 'testString' });
+    }
+  },{
+    description: 'should send url encoded data correctly (PATCH)',
+    expected: 'resolved: {"status": 200, "data": "{\\"form\\":\\"test\\": \\"testString\\"}\" ...',
+    before: helpers.setUrlEncodedSerializer,
+    func: function(resolve, reject) { cordova.plugin.http.patch('http://httpbin.org/anything', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).form.should.eql({ test: 'testString' });
+    }
+  },{
+    description: 'should resolve correct URL after redirect (GET) #33',
+    expected: 'resolved: {"status": 200, url: "http://httpbin.org/anything", ...',
+    func: function(resolve, reject) { cordova.plugin.http.get('http://httpbin.org/redirect-to?url=http://httpbin.org/anything', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.url.should.be.equal('http://httpbin.org/anything');
+    }
+  },{
+    description: 'should download a file from given URL to given path in local filesystem',
+    expected: 'resolved: {"content": "<?xml version=\'1.0\' encoding=\'us-ascii\'?>\\n\\n<!--  A SAMPLE set of slides  -->" ...',
+    func: function(resolve, reject) {
+      var sourceUrl = 'http://httpbin.org/xml';
+      var targetPath = cordova.file.cacheDirectory + 'test.xml';
+
+      cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function(entry) {
+        helpers.getWithXhr(function(content) {
+          resolve({
+            sourceUrl: sourceUrl,
+            targetPath: targetPath,
+            fullPath: entry.fullPath,
+            name: entry.name,
+            content: content
+          });
+        }, targetPath);
+      }, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.name.should.be.equal('test.xml');
+      result.data.content.should.be.equal("<?xml version='1.0' encoding='us-ascii'?>\n\n<!--  A SAMPLE set of slides  -->\n\n<slideshow \n    title=\"Sample Slide Show\"\n    date=\"Date of publication\"\n    author=\"Yours Truly\"\n    >\n\n    <!-- TITLE SLIDE -->\n    <slide type=\"all\">\n      <title>Wake up to WonderWidgets!</title>\n    </slide>\n\n    <!-- OVERVIEW -->\n    <slide type=\"all\">\n        <title>Overview</title>\n        <item>Why <em>WonderWidgets</em> are great</item>\n        <item/>\n        <item>Who <em>buys</em> WonderWidgets</item>\n    </slide>\n\n</slideshow>");
+    }
+  },{
+    description: 'should upload a file from given path in local filesystem to given URL #27',
+    expected: 'resolved: {"status": 200, "data": "files": {"test-file.txt": "I am a dummy file. I am used ...',
+    func: function(resolve, reject) {
+      var fileName = 'test-file.txt';
+      var fileContent = 'I am a dummy file. I am used for testing purposes!';
+      var sourcePath = cordova.file.cacheDirectory + fileName;
+      var targetUrl = 'http://httpbin.org/post';
+
+      helpers.writeToFile(function() {
+        cordova.plugin.http.uploadFile(targetUrl, {}, {}, sourcePath, fileName, resolve, reject);
+      }, fileName, fileContent);
+    },
+    validationFunc: function(driver, result) {
+      var fileName = 'test-file.txt';
+      var fileContent = 'I am a dummy file. I am used for testing purposes!';
+
+      result.type.should.be.equal('resolved');
+      result.data.data.should.be.a('string');
+
+      JSON
+        .parse(result.data.data)
+        .files[fileName]
+        .should.be.equal(fileContent);
+    }
+  },{
+    description: 'should encode HTTP array params correctly (GET) #45',
+    expected: 'resolved: {"status": 200, "data": "{\\"url\\":\\"http://httpbin.org/get?myArray[]=val1&myArray[]=val2&myArray[]=val3\\"}\" ...',
+    func: function(resolve, reject) {
+      cordova.plugin.http.get('http://httpbin.org/get', { myArray: [ 'val1', 'val2', 'val3' ], myString: 'testString' }, {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.data.should.be.a('string');
+
+      JSON
+        .parse(result.data.data)
+        .url
+        .should.be.equal('http://httpbin.org/get?myArray[]=val1&myArray[]=val2&myArray[]=val3&myString=testString');
+    }
+  },{
+    description: 'should reject non-string values in local header object #54',
+    expected: 'rejected: {"status": 0, "error": "advanced-http: header values must be strings" ...',
+    func: function(resolve, reject) {
+      cordova.plugin.http.get('http://httpbin.org/get', {}, { myTestHeader: 1 }, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.error.should.be.equal('advanced-http: header values must be strings');
+    }
+  },{
+    description: 'should throw an error while setting non-string value as global header #54',
+    expected: 'throwed: "advanced-http: header values must be strings"',
+    func: function(resolve, reject) {
+      cordova.plugin.http.setHeader('myTestHeader', 2);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('throwed');
+      result.message.should.be.equal('advanced-http: header values must be strings');
+    }
+  },{
+    description: 'should accept content-type "application/xml" #58',
+    expected: 'resolved: {"status": 200, ...',
+    func: function(resolve, reject) {
+      cordova.plugin.http.get('http://httpbin.org/xml', {}, {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.status.should.be.equal(200);
+    }
+  },{
+    description: 'should send programmatically set cookies correctly (GET)',
+    expected: 'resolved: {"status": 200, ...',
+    func: function(resolve, reject) {
+      cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
+      cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
+      cordova.plugin.http.get('http://httpbin.org/get', {}, {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.data.should.be.a('string');
+
+      JSON
+        .parse(result.data.data)
+        .headers
+        .Cookie
+        .should.be.equal('myCookie=myValue; mySecondCookie=mySecondValue');
+    }
+  },{
+    description: 'should not send any cookies after running "clearCookies" (GET) #59',
+    expected: 'resolved: {"status": 200, "data": "{\"headers\": {\"Cookie\": \"\"...',
+    func: function(resolve, reject) {
+      cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
+      cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
+      cordova.plugin.http.clearCookies();
+      cordova.plugin.http.get('http://httpbin.org/get', {}, {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.data.should.be.a('string');
+
+      JSON
+        .parse(result.data.data)
+        .headers
+        .Cookie
+        .should.be.equal('');
+    }
+  },{
+    description: 'should send programmatically set cookies correctly (DOWNLOAD) #57',
+    expected: 'resolved: {"content":{"cookies":{"myCookie":"myValue ...',
+    func: function(resolve, reject) {
+      var sourceUrl = 'http://httpbin.org/cookies';
+      var targetPath = cordova.file.cacheDirectory + 'cookies.json';
+
+      cordova.plugin.http.setCookie('http://httpbin.org/get', 'myCookie=myValue');
+      cordova.plugin.http.setCookie('http://httpbin.org/get', 'mySecondCookie=mySecondValue');
+
+      cordova.plugin.http.downloadFile(sourceUrl, {}, {}, targetPath, function(entry) {
+        helpers.getWithXhr(function(content) {
+          resolve({
+            sourceUrl: sourceUrl,
+            targetPath: targetPath,
+            fullPath: entry.fullPath,
+            name: entry.name,
+            content: content
+          });
+        }, targetPath);
+      }, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.name.should.be.equal('cookies.json');
+      result.data.content.should.be.a('string');
+
+      var cookies = JSON.parse(result.data.content).cookies;
+
+      cookies.myCookie.should.be.equal('myValue');
+      cookies.mySecondCookie.should.be.equal('mySecondValue');
+    }
+  }
+];
+
+if (typeof module !== 'undefined' && module.exports) {
+  module.exports = { tests: tests, hooks: hooks };
+}

test/js-mocha-specs.js

@@ -0,0 +1,125 @@
+const chai = require('chai');
+const mock = require('mock-require');
+const path = require('path');
+
+const should = chai.should();
+const PLUGIN_ID = path.resolve(__dirname, '..', 'www', 'advanced-http');
+
+describe('Advanced HTTP www interface', function() {
+  let http = {};
+  const noop = () => { /* intentionally doing nothing */ };
+  const loadHttp = () => {
+    http = mock.reRequire('../www/advanced-http');
+  };
+
+  this.timeout(900000);
+
+  beforeEach(() => {
+    // mocked btoa function (base 64 encoding strings)
+    global.btoa = decoded => new Buffer(decoded).toString('base64');
+
+    mock('cordova/exec', noop);
+    mock(`${PLUGIN_ID}.angular-integration`, { registerService: noop });
+    mock(`${PLUGIN_ID}.cookie-handler`, {});
+    loadHttp();
+  });
+
+  it('sets global headers correctly with two args (old interface)', () => {
+    http.setHeader('myKey', 'myValue');
+    http.headers['*'].myKey.should.equal('myValue');
+  });
+
+  it('sets global headers correctly with three args (new interface) #24', () => {
+    http.setHeader('*', 'myKey', 'myValue');
+    http.headers['*'].myKey.should.equal('myValue');
+  });
+
+  it('sets host headers correctly #24', () => {
+    http.setHeader('www.google.de', 'myKey', 'myValue');
+    http.headers['www.google.de'].myKey.should.equal('myValue');
+  });
+
+  it('resolves global headers correctly #24', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.setHeader('*', 'myKey', 'myValue');
+    http.get('url', {}, {}, noop, noop);
+  });
+
+  it('resolves host headers correctly (set without port number) #37', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.setHeader('www.google.de', 'myKey', 'myValue');
+    http.get('https://www.google.de/?gws_rd=ssl', {}, {}, noop, noop);
+  });
+
+  it('resolves host headers correctly (set with port number) #37', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.setHeader('www.google.de:8080', 'myKey', 'myValue');
+    http.get('https://www.google.de:8080/?gws_rd=ssl', {}, {}, noop, noop);
+  });
+
+  it('resolves request headers correctly', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.get('https://www.google.de/?gws_rd=ssl', {}, { myKey: 'myValue' }, noop, noop);
+  });
+
+  it('sets basic authentication header correctly #36', () => {
+    http.useBasicAuth('name', 'pass');
+    http.headers['*'].Authorization.should.equal('Basic bmFtZTpwYXNz');
+  });
+
+  it('throws an Error when you try to add a cookie by using "setHeader" #46', () => {
+    (function() { http.setHeader('*', 'cookie', 'value') }).should.throw();
+  });
+});

test/test-definitions.js

@@ -1,67 +0,0 @@
-const hooks = {
-  onBeforeEachTest: function(done) {
-    cordova.plugin.http.acceptAllCerts(false, done, done);
-  }
-};
-
-const helpers = {
-  acceptAllCerts: function(done) { cordova.plugin.http.acceptAllCerts(true, done, done); }
-};
-
-const tests = [
-  {
-    description: 'should reject self signed cert (GET)',
-    expected: 'rejected: {"status":-1,"error":"cancelled"}',
-    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
-  },{
-    description: 'should reject self signed cert (PUT)',
-    expected: 'rejected: {"status":-1,"error":"cancelled"}',
-    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
-  },{
-    description: 'should reject self signed cert (POST)',
-    expected: 'rejected: {"status":-1,"error":"cancelled"}',
-    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
-  },{
-    description: 'should reject self signed cert (PATCH)',
-    expected: 'rejected: {"status":-1,"error":"cancelled"}',
-    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
-  },{
-    description: 'should reject self signed cert (DELETE)',
-    expected: 'rejected: {"status":-1,"error":"cancelled"}',
-    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
-  },{
-    description: 'should accept bad cert (GET)',
-    expected: 'resolved: {\"status\":200,',
-    before: helpers.acceptAllCerts,
-    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
-  },{
-    description: 'should accept bad cert (PUT)',
-    expected: 'rejected: {\"status\":405,', // will be rejected because PUT is not allowed
-    before: helpers.acceptAllCerts,
-    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
-  },{
-    description: 'should accept bad cert (POST)',
-    expected: 'rejected: {\"status\":405,', // will be rejected because POST is not allowed
-    before: helpers.acceptAllCerts,
-    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
-  },{
-    description: 'should accept bad cert (PATCH)',
-    expected: 'rejected: {\"status\":405,', // will be rejected because PATCH is not allowed
-    before: helpers.acceptAllCerts,
-    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
-  },{
-    description: 'should accept bad cert (DELETE)',
-    expected: 'rejected: {\"status\":405,', // will be rejected because DELETE is not allowed
-    before: helpers.acceptAllCerts,
-    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
-  },{
-    description: 'should fetch data from http://google.com/ (GET)',
-    expected: 'resolved: {\"status\":200,',
-    before: helpers.acceptAllCerts,
-    func: function(resolve, reject) { cordova.plugin.http.get('http://google.com/', {}, {}, resolve, reject); }
-  }
-];
-
-if (module && module.exports) {
-  module.exports = { tests: tests, hooks: hooks };
-}

www/advanced-http.js

@@ -39,6 +39,11 @@ var exec = require('cordova/exec');
 var angularIntegration = require(pluginId +'.angular-integration');
 var cookieHandler = require(pluginId + '.cookie-handler');
 
+var MANDATORY_SUCCESS = 'advanced-http: missing mandatory "onSuccess" callback function';
+var MANDATORY_FAIL = 'advanced-http: missing mandatory "onFail" callback function';
+var ADDING_COOKIES_NOT_SUPPORTED = 'advanced-http: "setHeader" does not support adding cookies, please use "setCookie" function instead';
+var HEADER_VALUE_MUST_BE_STRING = 'advanced-http: header values must be strings';
+
 // Thanks Mozilla: https://developer.mozilla.org/en-US/docs/Web/API/WindowBase64/Base64_encoding_and_decoding#The_.22Unicode_Problem.22
 function b64EncodeUnicode(str) {
     return btoa(encodeURIComponent(str).replace(/%([0-9A-F]{2})/g, function (match, p1) {
@@ -61,6 +66,29 @@ function mergeHeaders(globalHeaders, localHeaders) {
     return localHeaders;
 }
 
+function checkHeaders(headers) {
+  var keys = Object.keys(headers);
+  var key;
+
+  for (var i = 0; i < keys.length; i++) {
+      key = keys[i];
+
+      if (typeof headers[key] !== 'string') {
+        return false;
+      }
+  }
+
+  return true;
+}
+
+function onInvalidHeader(handler) {
+  handler({
+    status: 0,
+    error: HEADER_VALUE_MUST_BE_STRING,
+    headers: {}
+  });
+}
+
 function checkSerializer(serializer) {
     serializer = serializer || '';
     serializer = serializer.trim().toLowerCase();
@@ -114,13 +142,31 @@ function getCookieHeader(url) {
     return { Cookie: cookieHandler.getCookieString(url) };
 }
 
+function getMatchingHostHeaders(url, headersList) {
+    var matches = url.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
+    var domain = matches && matches[1];
+
+    return headersList[domain] || null;
+}
+
+function getMergedHeaders(url, requestHeaders, predefinedHeaders) {
+  var globalHeaders = predefinedHeaders['*'] || {};
+  var hostHeaders = getMatchingHostHeaders(url, predefinedHeaders) || {};
+  var mergedHeaders = mergeHeaders(globalHeaders, hostHeaders);
+
+  mergedHeaders = mergeHeaders(mergedHeaders, requestHeaders);
+  mergedHeaders = mergeHeaders(mergedHeaders, getCookieHeader(url));
+
+  return mergedHeaders;
+}
+
 function handleMissingCallbacks(successFn, failFn) {
     if (Object.prototype.toString.call(successFn) !== '[object Function]') {
-        throw new Error('advanced-http: missing mandatory "onSuccess" callback function');
+        throw new Error(MANDATORY_SUCCESS);
     }
 
     if (Object.prototype.toString.call(failFn) !== '[object Function]') {
-        throw new Error('advanced-http: missing mandatory "onFail" callback function');
+        throw new Error(MANDATORY_FAIL);
     }
 }
 
@@ -133,21 +179,47 @@ var http = {
         return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
     },
     useBasicAuth: function (username, password) {
-        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
+        this.setHeader('*', 'Authorization', 'Basic ' + b64EncodeUnicode(username + ':' + password));
     },
-    setHeader: function (header, value) {
-        this.headers[header] = value;
+    setHeader: function () {
+        // this one is for being backward compatible
+        var host = '*';
+        var header = arguments[0];
+        var value = arguments[1];
+
+        if (arguments.length === 3) {
+            host = arguments[0];
+            header = arguments[1];
+            value = arguments[2];
+        }
+
+        if (header.toLowerCase() === 'cookie') {
+          throw new Error(ADDING_COOKIES_NOT_SUPPORTED);
+        }
+
+        if (typeof value !== 'string') {
+          throw new Error(HEADER_VALUE_MUST_BE_STRING);
+        }
+
+        this.headers[host] = this.headers[host] || {};
+        this.headers[host][header] = value;
     },
     setDataSerializer: function (serializer) {
         this.dataSerializer = checkSerializer(serializer);
     },
+    setCookie: function (url, cookie, options) {
+        cookieHandler.setCookie(url, cookie, options);
+    },
     clearCookies: function () {
-        return cookieHandler.clearCookies();
+        cookieHandler.clearCookies();
     },
     removeCookies: function (url, callback) {
         cookieHandler.removeCookies(url, callback);
     },
-    setRequestTimeout: function(timeout) {
+    getCookieString: function (url) {
+        return cookieHandler.getCookieString(url);
+    },
+    setRequestTimeout: function (timeout) {
         this.timeoutInSeconds = timeout;
     },
     enableSSLPinning: function (enable, success, failure) {
@@ -156,7 +228,7 @@ var http = {
     acceptAllCerts: function (allow, success, failure) {
         return exec(success, failure, 'CordovaHttpPlugin', 'acceptAllCerts', [allow]);
     },
-    disableRedirect: function(disable, success, failure) {
+    disableRedirect: function (disable, success, failure) {
         return exec(success, failure, 'CordovaHttpPlugin', 'disableRedirect', [disable]);
     },
     validateDomainName: function (validate, success, failure) {
@@ -166,9 +238,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -179,9 +253,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -192,9 +268,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -206,9 +284,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -220,9 +300,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -233,9 +315,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -246,9 +330,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -259,9 +345,11 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
+
+        if (!checkHeaders(headers)) {
+          return onInvalidHeader(failure);
+        }
 
         var onSuccess = injectCookieHandler(url, injectFileEntryHandler(success));
         var onFail = injectCookieHandler(url, failure);

www/angular-integration.js

@@ -38,8 +38,8 @@ function registerService(http) {
             useBasicAuth: function (username, password) {
                 return http.useBasicAuth(username, password);
             },
-            setHeader: function (header, value) {
-                return http.setHeader(header, value);
+            setHeader: function (host, header, value) {
+                return http.setHeader(host, header, value);
             },
             setDataSerializer: function (serializer) {
                 return http.setDataSerializer(serializer);

www/cookie-handler.js

@@ -10,6 +10,7 @@ var cookieJar = new ToughCookie.CookieJar(store);
 
 module.exports = {
     setCookieFromString: setCookieFromString,
+    setCookie: setCookie,
     getCookieString: getCookieString,
     clearCookies: clearCookies,
     removeCookies: removeCookies
@@ -45,6 +46,12 @@ function setCookieFromString(url, cookieStr) {
     }
 }
 
+function setCookie(url, cookie, options) {
+  options = options || {};
+  options.ignoreError = false;
+  cookieJar.setCookieSync(cookie, url, options);
+}
+
 function getCookieString(url) {
     return cookieJar.getCookieStringSync(url);
 }