release v1.10.0

update docu and change log
replace all typeof calls
2026-07-26 00:00:14 +08:00 · 2018-02-09 10:54:42 +01:00 · 2018-02-09 10:45:03 +01:00 · 2018-02-09 10:06:32 +01:00 · 2018-02-09 10:01:48 +01:00 · 2018-02-09 09:16:30 +01:00
32 changed files with 1149 additions and 645 deletions
@@ -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
@@ -3,3 +3,5 @@ tags
 .zedstate
 npm-debug.log
 /temp
+/android-sdk-macosx.zip
+/android-sdk-macosx/**
@@ -4,6 +4,10 @@ language: objective-c
 os: osx
 osx_image: xcode9.1

+env:
+  - TARGET_PLATFORM=android
+  - TARGET_PLATFORM=ios
+
 cache:
  directories:
    - node_modules
@@ -15,27 +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
 - npm run testjs
- scripts/test-app.sh --ios --emulator
+- 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:

@@ -1,5 +1,30 @@
 # Changelog

+## 1.10.0
+
+- Feature #34: add new serializer "utf8" sending utf-8 encoded plain text (thanks robertocapuano)
+
+## 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)
@@ -63,8 +63,8 @@ This sets up all future requests to use Basic HTTP authentication with the given
 cordova.plugin.http.useBasicAuth('user', 'password');
 ```

-### setHeader
-Set a header for all future requests to a specified host. Takes a hostname, a header and a value.
+### setHeader<a name="setHeader"></a>
+Set a header for all future requests to a specified host. Takes a hostname, a header and a value (must be a string value).

 ```js
 cordova.plugin.http.setHeader('Hostname', 'Header', 'Value');
@@ -101,11 +101,14 @@ Set the data serializer which will be used for all future PATCH, POST and PUT re
 cordova.plugin.http.setDataSerializer('urlencoded');
 ```

-You can choose one of these two:
+You can choose one of these:
 * `urlencoded`: send data as url encoded content in body (content type "application/x-www-form-urlencoded")
 * `json`: send data as JSON encoded content in body (content type "application/json")
+* `utf8`: send data as plain UTF8 encoded string in body (content type "plain/text")

-Caution: `urlencoded` does not support serializing deep structures whereas `json` does.
+You can also override the default content type headers by specifying your own headers (see [setHeader](#setHeader)).
+
+__Caution__: `urlencoded` does not support serializing deep structures whereas `json` does.

 ### setRequestTimeout
 Set how long to wait for a request to respond, in seconds.
@@ -114,6 +117,20 @@ Set how long to wait for a request to respond, in seconds.
 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.

@@ -157,7 +174,7 @@ This function was removed in v1.6.2. Domain name validation is disabled automati
 Remove all cookies associated with a given URL.

 ```js
-cordova.plugin.http.removeCookies(url);
+cordova.plugin.http.removeCookies(url, callback);
 ```

 ### post<a name="post"></a>
@@ -279,12 +296,13 @@ cordova.plugin.http.downloadFile("https://google.com/", {

 ## 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

@@ -1,9 +1,11 @@
 {
  "name": "cordova-plugin-advanced-http",
-  "version": "1.7.1",
+  "version": "1.10.0",
  "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
  "scripts": {
-    "testapp": "./scripts/build-test-app.sh && ./scripts/test-app.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"
@@ -55,7 +57,7 @@
    "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",
@@ -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.7.1">
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="1.10.0">
  <name>Advanced HTTP plugin</name>
  <description>
        Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning
@@ -10,9 +10,11 @@
  <dependency id="cordova-plugin-file" version=">=2.0.0"/>
  <js-module src="www/lodash.js" name="lodash"/>
  <js-module src="www/umd-tough-cookie.js" name="tough-cookie"/>
+  <js-module src="www/messages.js" name="messages"/>
  <js-module src="www/local-storage-store.js" name="local-storage-store"/>
  <js-module src="www/cookie-handler.js" name="cookie-handler"/>
  <js-module src="www/angular-integration.js" name="angular-integration"/>
+  <js-module src="www/helpers.js" name="helpers"/>
  <js-module src="www/advanced-http.js" name="http">
    <clobbers target="cordova.plugin.http"/>
  </js-module>
@@ -24,6 +26,7 @@
    </config-file>
    <header-file src="src/ios/CordovaHttpPlugin.h"/>
    <header-file src="src/ios/TextResponseSerializer.h"/>
+    <header-file src="src/ios/TextRequestSerializer.h"/>
    <header-file src="src/ios/AFNetworking/AFHTTPSessionManager.h"/>
    <header-file src="src/ios/AFNetworking/AFNetworking.h"/>
    <header-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.h"/>
@@ -33,6 +36,7 @@
    <header-file src="src/ios/AFNetworking/AFURLSessionManager.h"/>
    <source-file src="src/ios/CordovaHttpPlugin.m"/>
    <source-file src="src/ios/TextResponseSerializer.m"/>
+    <source-file src="src/ios/TextRequestSerializer.m"/>
    <source-file src="src/ios/AFNetworking/AFHTTPSessionManager.m"/>
    <source-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.m"/>
    <source-file src="src/ios/AFNetworking/AFSecurityPolicy.m"/>
@@ -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
@@ -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
@@ -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";
@@ -120,6 +128,7 @@ abstract class CordovaHttp {
        if (sslPinning.get()) {
            request.pinToCerts();
        }
+
        return request;
    }

@@ -127,9 +136,25 @@ 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 if (new String("utf8").equals(this.getSerializerName())) {
+          request.contentType("text/plain", request.CHARSET_UTF8);
+          request.send(this.getParamsMap().get("text").toString());
+      } else
+      {
+          request.form(this.getParamsMap());
+      }
+
+      return request;
+    }
+
    protected void respondWithError(int status, String msg) {
        try {
            JSONObject response = new JSONObject();
@@ -142,7 +167,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 {
@@ -172,14 +197,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());
+      }
+    }
 }
@@ -57,7 +57,7 @@ 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());
@@ -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,17 +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(-1, e.getMessage());
+          this.respondWithError(e.getMessage());
        }
    }
 }
@@ -26,41 +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(-1, e.getMessage());
+            this.respondWithError(e.getMessage());
        }
    }
 }
@@ -25,41 +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(-1, e.getMessage());
+            this.respondWithError(e.getMessage());
        }
    }
 }
@@ -25,48 +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(-1, e.getMessage());
+            this.respondWithError(e.getMessage());
        }
    }
 }
@@ -25,48 +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(-1, e.getMessage());
+            this.respondWithError(e.getMessage());
        }
    }
 }
@@ -25,48 +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");
+            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(-1, e.getMessage());
+            this.respondWithError(e.getMessage());
        }
    }
 }
@@ -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,37 +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");
-            }
+            this.handleHttpRequestException(e);
        } catch (Exception e) {
-          this.respondWithError(-1, e.getMessage());
+          this.respondWithError(e.getMessage());
        }
    }
 }
@@ -1,6 +1,7 @@
 #import "CordovaHttpPlugin.h"
 #import "CDVFile.h"
 #import "TextResponseSerializer.h"
+#import "TextRequestSerializer.h"
 #import "AFHTTPSessionManager.h"

@interface CordovaHttpPlugin()
@@ -28,6 +29,8 @@
 - (void)setRequestSerializer:(NSString*)serializerName forManager:(AFHTTPSessionManager*)manager {
    if ([serializerName isEqualToString:@"json"]) {
        manager.requestSerializer = [AFJSONRequestSerializer serializer];
+    } else if ([serializerName isEqualToString:@"utf8"]) {
+        manager.requestSerializer = [TextRequestSerializer serializer];
    } else {
        manager.requestSerializer = [AFHTTPRequestSerializer serializer];
    }
@@ -51,6 +54,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 +66,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"];
@@ -71,6 +76,17 @@
    }
 }

+- (void)handleException:(NSException*)exception withCommand:(CDVInvokedUrlCommand*)command {
+  CordovaHttpPlugin* __weak weakSelf = self;
+
+  NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+  [dictionary setValue:exception.userInfo forKey:@"error"];
+  [dictionary setObject:[NSNumber numberWithInt:-1] forKey:@"status"];
+
+  CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+  [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+}
+
 - (NSNumber*)getStatusCode:(NSError*) error {
    switch ([error code]) {
        case -1001:
@@ -157,19 +173,25 @@

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [manager POST:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+    @try {
+        [manager POST:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

 - (void)get:(CDVInvokedUrlCommand*)command {
@@ -188,21 +210,26 @@
    [self setRedirect: manager];

    CordovaHttpPlugin* __weak weakSelf = self;
-
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+    @try {
+        [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

 - (void)put:(CDVInvokedUrlCommand*)command {
@@ -222,19 +249,25 @@

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [manager PUT:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+    @try {
+        [manager PUT:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

 - (void)patch:(CDVInvokedUrlCommand*)command {
@@ -254,19 +287,25 @@

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [manager PATCH:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+    @try {
+        [manager PATCH:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

 - (void)delete:(CDVInvokedUrlCommand*)command {
@@ -284,21 +323,26 @@
    [self setRedirect: manager];

    CordovaHttpPlugin* __weak weakSelf = self;
-
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [manager DELETE:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+    @try {
+        [manager DELETE:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

 - (void)head:(CDVInvokedUrlCommand*)command {
@@ -314,22 +358,27 @@
    [self setRedirect: manager];

    CordovaHttpPlugin* __weak weakSelf = self;
-
    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager HEAD:url parameters:parameters success:^(NSURLSessionTask *task) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        // no 'body' for HEAD request, omitting 'data'
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+    @try {
+        [manager HEAD:url parameters:parameters success:^(NSURLSessionTask *task) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            // no 'body' for HEAD request, omitting 'data'
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];

-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

 - (void)uploadFile:(CDVInvokedUrlCommand*)command {
@@ -351,30 +400,36 @@

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
-    [manager POST:url parameters:parameters constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
-        NSError *error;
-        [formData appendPartWithFileURL:fileURL name:name error:&error];
-        if (error) {
+
+    @try {
+        [manager POST:url parameters:parameters constructingBodyWithBlock:^(id<AFMultipartFormData> formData) {
+            NSError *error;
+            [formData appendPartWithFileURL:fileURL name:name error:&error];
+            if (error) {
+                NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+                [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
+                [dictionary setObject:@"Could not add file to post body." forKey:@"error"];
+                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+                [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+                return;
+            }
+        } progress:nil success:^(NSURLSessionTask *task, id responseObject) {
            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
-            [dictionary setObject:@"Could not add file to post body." forKey:@"error"];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:responseObject];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            return;
-        }
-    } progress:nil success:^(NSURLSessionTask *task, id responseObject) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];
-
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }


@@ -398,70 +453,76 @@

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
-    [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
-        /*
-         *
-         * Licensed to the Apache Software Foundation (ASF) under one
-         * or more contributor license agreements.  See the NOTICE file
-         * distributed with this work for additional information
-         * regarding copyright ownership.  The ASF licenses this file
-         * to you under the Apache License, Version 2.0 (the
-         * "License"); you may not use this file except in compliance
-         * with the License.  You may obtain a copy of the License at
-         *
-         *   http://www.apache.org/licenses/LICENSE-2.0
-         *
-         * Unless required by applicable law or agreed to in writing,
-         * software distributed under the License is distributed on an
-         * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-         * KIND, either express or implied.  See the License for the
-         * specific language governing permissions and limitations
-         * under the License.
-         *
-         * Modified by Andrew Stephan for Sync OnSet
-         *
-         */
-        // Download response is okay; begin streaming output to file
-        NSString* parentPath = [filePath stringByDeletingLastPathComponent];

-        // create parent directories if needed
-        NSError *error;
-        if ([[NSFileManager defaultManager] createDirectoryAtPath:parentPath withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
-            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
-            if (error) {
-                [dictionary setObject:[NSString stringWithFormat:@"Could not create path to save downloaded file: %@", [error localizedDescription]] forKey:@"error"];
-            } else {
-                [dictionary setObject:@"Could not create path to save downloaded file" forKey:@"error"];
+    @try {
+        [manager GET:url parameters:parameters progress:nil success:^(NSURLSessionTask *task, id responseObject) {
+            /*
+             *
+             * Licensed to the Apache Software Foundation (ASF) under one
+             * or more contributor license agreements.  See the NOTICE file
+             * distributed with this work for additional information
+             * regarding copyright ownership.  The ASF licenses this file
+             * to you under the Apache License, Version 2.0 (the
+             * "License"); you may not use this file except in compliance
+             * with the License.  You may obtain a copy of the License at
+             *
+             *   http://www.apache.org/licenses/LICENSE-2.0
+             *
+             * Unless required by applicable law or agreed to in writing,
+             * software distributed under the License is distributed on an
+             * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+             * KIND, either express or implied.  See the License for the
+             * specific language governing permissions and limitations
+             * under the License.
+             *
+             * Modified by Andrew Stephan for Sync OnSet
+             *
+             */
+            // Download response is okay; begin streaming output to file
+            NSString* parentPath = [filePath stringByDeletingLastPathComponent];
+
+            // create parent directories if needed
+            NSError *error;
+            if ([[NSFileManager defaultManager] createDirectoryAtPath:parentPath withIntermediateDirectories:YES attributes:nil error:&error] == NO) {
+                NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+                [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
+                if (error) {
+                    [dictionary setObject:[NSString stringWithFormat:@"Could not create path to save downloaded file: %@", [error localizedDescription]] forKey:@"error"];
+                } else {
+                    [dictionary setObject:@"Could not create path to save downloaded file" forKey:@"error"];
+                }
+                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+                [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+                return;
            }
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            return;
-        }
-        NSData *data = (NSData *)responseObject;
-        if (![data writeToFile:filePath atomically:YES]) {
+            NSData *data = (NSData *)responseObject;
+            if (![data writeToFile:filePath atomically:YES]) {
+                NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+                [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
+                [dictionary setObject:@"Could not write the data to the given filePath." forKey:@"error"];
+                CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+                [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+                return;
+            }
+
+            id filePlugin = [self.commandDelegate getCommandInstance:@"File"];
            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-            [dictionary setObject:[NSNumber numberWithInt:500] forKey:@"status"];
-            [dictionary setObject:@"Could not write the data to the given filePath." forKey:@"error"];
+            [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];
+            [dictionary setObject:[filePlugin getDirectoryEntry:filePath isDirectory:NO] forKey:@"file"];
+
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
+            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+        } failure:^(NSURLSessionTask *task, NSError *error) {
+            NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
+            [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
            [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-            return;
-        }
-
-        id filePlugin = [self.commandDelegate getCommandInstance:@"File"];
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleSuccess:dictionary withResponse:(NSHTTPURLResponse*)task.response andData:nil];
-        [dictionary setObject:[filePlugin getDirectoryEntry:filePath isDirectory:NO] forKey:@"file"];
-
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    } failure:^(NSURLSessionTask *task, NSError *error) {
-        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
-
-        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
-        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    }];
+        }];
+    }
+    @catch (NSException *exception) {
+        [self handleException:exception withCommand:command];
+    }
 }

@end
@@ -0,0 +1,8 @@
+#import <Foundation/Foundation.h>
+#import "AFURLRequestSerialization.h"
+
+@interface TextRequestSerializer : AFHTTPRequestSerializer
+
+ (instancetype)serializer;
+
+@end
@@ -0,0 +1,53 @@
+#import "TextRequestSerializer.h"
+
+@implementation TextRequestSerializer
+
+ (instancetype)serializer
+{
+    TextRequestSerializer *serializer = [[self alloc] init];
+    return serializer;
+}
+
+#pragma mark - AFURLRequestSerialization
+
+- (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
+                               withParameters:(id)parameters
+                                        error:(NSError *__autoreleasing *)error
+{
+    NSParameterAssert(request);
+
+    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+        return [super requestBySerializingRequest:request withParameters:parameters error:error];
+    }
+
+    NSMutableURLRequest *mutableRequest = [request mutableCopy];
+
+    [self.HTTPRequestHeaders enumerateKeysAndObjectsUsingBlock:^(id field, id value, BOOL * __unused stop) {
+        if (![request valueForHTTPHeaderField:field]) {
+            [mutableRequest setValue:value forHTTPHeaderField:field];
+        }
+    }];
+
+    if (parameters) {
+        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
+            [mutableRequest setValue:@"text/plain; charset=utf-8" forHTTPHeaderField:@"Content-Type"];
+        }
+
+        [mutableRequest setHTTPBody: [[parameters valueForKey:@"text"] dataUsingEncoding:NSUTF8StringEncoding]];
+    }
+
+    return mutableRequest;
+}
+
+#pragma mark - NSSecureCoding
+
+- (instancetype)initWithCoder:(NSCoder *)decoder {
+    self = [super initWithCoder:decoder];
+    if (!self) {
+        return nil;
+    }
+
+    return self;
+}
+
+@end
@@ -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;
 }
@@ -8,18 +8,21 @@ const testDefinitions = require('../app-test-definitions');
 const pkgjson = require('../../package.json');

 describe('Advanced HTTP', function() {
+  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;
@@ -57,7 +60,7 @@ describe('Advanced HTTP', function() {

  const validateResult = testDefinition => driver
    .safeExecute('app.lastResult')
-    .then(result => testDefinition.validationFunc(driver, result));
+    .then(result => testDefinition.validationFunc(driver, result, targetInfo));

  const clickNext = () => driver
    .elementById('nextBtn')
@@ -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>
@@ -33,6 +33,16 @@ const app = {
    };
  },

+  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);
  },
@@ -46,7 +56,12 @@ const app = {
    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) {
@@ -1,12 +1,38 @@
 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')); }
+  setJsonSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('json')); },
+  setUtf8StringSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('utf8')); },
+  setUrlEncodedSerializer: function(done) { done(cordova.plugin.http.setDataSerializer('urlencoded')); },
+  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 = [
@@ -14,41 +40,41 @@ 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) {
+    validationFunc: function(driver, result, targetInfo) {
      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -1, error:'cancelled' });
+      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) {
+    validationFunc: function(driver, result, targetInfo) {
      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -1, error:'cancelled' });
+      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) {
+    validationFunc: function(driver, result, targetInfo) {
      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -1, error:'cancelled' });
+      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) {
+    validationFunc: function(driver, result, targetInfo) {
      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -1, error:'cancelled' });
+      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) {
+    validationFunc: function(driver, result, targetInfo) {
      result.type.should.be.equal('rejected');
-      result.data.should.be.eql({ status: -1, error:'cancelled' });
+      result.data.should.be.eql({ status: -1, error: targetInfo.isAndroid ? 'SSL handshake failed' : 'cancelled' });
    }
  },{
    description: 'should accept bad cert (GET)',
@@ -106,7 +132,7 @@ const tests = [
    }
  },{
    description: 'should send JSON object correctly (POST)',
-    expected: 'resolved: {"status": 200, data: "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    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) {
@@ -115,7 +141,7 @@ const tests = [
    }
  },{
    description: 'should send JSON object correctly (PUT)',
-    expected: 'resolved: {"status": 200, data: "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    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) {
@@ -124,7 +150,7 @@ const tests = [
    }
  },{
    description: 'should send JSON object correctly (PATCH)',
-    expected: 'resolved: {"status": 200, data: "{\\"json\\":\\"test\\": \\"testString\\"}\" ...',
+    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) {
@@ -132,8 +158,8 @@ const tests = [
      JSON.parse(result.data.data).json.should.eql({ test: 'testString' });
    }
  },{
-    description: 'should send JSON array correctly (POST)',
-    expected: 'resolved: {"status": 200, data: "[ 1, 2, 3 ]\" ...',
+    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) {
@@ -141,8 +167,8 @@ const tests = [
      JSON.parse(result.data.data).json.should.eql([ 1, 2, 3 ]);
    }
  },{
-    description: 'should send JSON array correctly (PUT)',
-    expected: 'resolved: {"status": 200, data: "[ 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) {
@@ -150,14 +176,224 @@ const tests = [
      JSON.parse(result.data.data).json.should.eql([ 1, 2, 3 ]);
    }
  },{
-    description: 'should send JSON array correctly (PATCH)',
-    expected: 'resolved: {"status": 200, data: "[ 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');
+    }
+  },{
+    description: 'should send UTF-8 encoded raw string correctly (POST)',
+    expected: 'resolved: {"status": 200, "data": "{\\"data\\": \\"this is a test string\\"...',
+    before: helpers.setUtf8StringSerializer,
+    func: function(resolve, reject) {
+      cordova.plugin.http.post('http://httpbin.org/anything', 'this is a test string', {}, resolve, reject);
+    },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      JSON.parse(result.data.data).data.should.eql('this is a test string');
+    }
  }
 ];

@@ -3,12 +3,18 @@ const mock = require('mock-require');
 const path = require('path');

 const should = chai.should();
+
+const HELPERS_ID = path.resolve(__dirname, '..', 'www', 'helpers');
 const PLUGIN_ID = path.resolve(__dirname, '..', 'www', 'advanced-http');

 describe('Advanced HTTP www interface', function() {
  let http = {};
+  let helpers = {};
+
  const noop = () => { /* intentionally doing nothing */ };
+
  const loadHttp = () => {
+    mock(`${PLUGIN_ID}.helpers`, mock.reRequire('../www/helpers'));
    http = mock.reRequire('../www/advanced-http');
  };

@@ -19,28 +25,32 @@ describe('Advanced HTTP www interface', function() {
    global.btoa = decoded => new Buffer(decoded).toString('base64');

    mock('cordova/exec', noop);
-    mock(`${PLUGIN_ID}.angular-integration`, { registerService: noop });
    mock(`${PLUGIN_ID}.cookie-handler`, {});
+    mock(`${HELPERS_ID}.cookie-handler`, {});
+    mock(`${PLUGIN_ID}.messages`, require('../www/messages'));
+    mock(`${HELPERS_ID}.messages`, require('../www/messages'));
+    mock(`${PLUGIN_ID}.angular-integration`, { registerService: noop });
+
    loadHttp();
  });

  it('sets global headers correctly with two args (old interface)', () => {
    http.setHeader('myKey', 'myValue');
-    http.headers['*'].myKey.should.equal('myValue');
+    http.getHeaders('*').myKey.should.equal('myValue');
  });

-  it('sets global headers correctly with three args (new interface)', () => {
+  it('sets global headers correctly with three args (new interface) #24', () => {
    http.setHeader('*', 'myKey', 'myValue');
-    http.headers['*'].myKey.should.equal('myValue');
+    http.getHeaders('*').myKey.should.equal('myValue');
  });

-  it('sets host headers correctly', () => {
+  it('sets host headers correctly #24', () => {
    http.setHeader('www.google.de', 'myKey', 'myValue');
-    http.headers['www.google.de'].myKey.should.equal('myValue');
+    http.getHeaders('www.google.de').myKey.should.equal('myValue');
  });

-  it('resolves global headers correctly', () => {
-    mock(`${PLUGIN_ID}.cookie-handler`, {
+  it('resolves global headers correctly #24', () => {
+    mock(`${HELPERS_ID}.cookie-handler`, {
      getCookieString: () => 'fakeCookieString'
    });

@@ -58,8 +68,8 @@ describe('Advanced HTTP www interface', function() {
    http.get('url', {}, {}, noop, noop);
  });

-  it('resolves host headers correctly (set without port number)', () => {
-    mock(`${PLUGIN_ID}.cookie-handler`, {
+  it('resolves host headers correctly (set without port number) #37', () => {
+    mock(`${HELPERS_ID}.cookie-handler`, {
      getCookieString: () => 'fakeCookieString'
    });

@@ -77,8 +87,8 @@ describe('Advanced HTTP www interface', function() {
    http.get('https://www.google.de/?gws_rd=ssl', {}, {}, noop, noop);
  });

-  it('resolves host headers correctly (set with port number)', () => {
-    mock(`${PLUGIN_ID}.cookie-handler`, {
+  it('resolves host headers correctly (set with port number) #37', () => {
+    mock(`${HELPERS_ID}.cookie-handler`, {
      getCookieString: () => 'fakeCookieString'
    });

@@ -97,7 +107,7 @@ describe('Advanced HTTP www interface', function() {
  });

  it('resolves request headers correctly', () => {
-    mock(`${PLUGIN_ID}.cookie-handler`, {
+    mock(`${HELPERS_ID}.cookie-handler`, {
      getCookieString: () => 'fakeCookieString'
    });

@@ -114,8 +124,12 @@ describe('Advanced HTTP www interface', function() {
    http.get('https://www.google.de/?gws_rd=ssl', {}, { myKey: 'myValue' }, noop, noop);
  });

-  it('sets basic authentication header correctly', () => {
+  it('sets basic authentication header correctly #36', () => {
    http.useBasicAuth('name', 'pass');
-    http.headers['*'].Authorization.should.equal('Basic bmFtZTpwYXNz');
+    http.getHeaders('*').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();
  });
 });
@@ -20,138 +20,36 @@
 * under the License.
 *
 * Modified by Andrew Stephan for Sync OnSet
- * Modified by Sefa Ilkimen:
- *  - added configurable params serializer
- *  - added put and delete methods
- *  - using cordova www module pattern
- *  - some minor improvements
- *
+ * Modified by Sefa Ilkimen
 */

 /*
 * An HTTP Plugin for PhoneGap.
 */

-var pluginId = module.id.slice(0, module.id.indexOf('.'));
-var validSerializers = ['urlencoded', 'json'];
+var pluginId = module.id.slice(0, module.id.lastIndexOf('.'));

 var exec = require('cordova/exec');
 var angularIntegration = require(pluginId +'.angular-integration');
 var cookieHandler = require(pluginId + '.cookie-handler');
+var helpers = require(pluginId + '.helpers');
+var messages = require(pluginId + '.messages');

-// 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) {
-        return String.fromCharCode('0x' + p1);
-    }));
-}
+var internals = {
+  headers: {},
+  dataSerializer: 'urlencoded',
+  timeoutInSeconds: 60.0,
+};

-function mergeHeaders(globalHeaders, localHeaders) {
-    var globalKeys = Object.keys(globalHeaders);
-    var key;
-
-    for (var i = 0; i < globalKeys.length; i++) {
-        key = globalKeys[i];
-
-        if (!localHeaders.hasOwnProperty(key)) {
-            localHeaders[key] = globalHeaders[key];
-        }
-    }
-
-    return localHeaders;
-}
-
-function checkSerializer(serializer) {
-    serializer = serializer || '';
-    serializer = serializer.trim().toLowerCase();
-
-    if (validSerializers.indexOf(serializer) > -1) {
-        return serializer;
-    }
-
-    return serializer[0];
-}
-
-function resolveCookieString(headers) {
-    var keys = Object.keys(headers || {});
-
-    for (var i = 0; i < keys.length; ++i) {
-        if (keys[i].match(/^set-cookie$/i)) {
-            return headers[keys[i]];
-        }
-    }
-
-    return null;
-}
-
-function createFileEntry(rawEntry) {
-    var entry = new (require('cordova-plugin-file.FileEntry'))();
-
-    entry.isDirectory = rawEntry.isDirectory;
-    entry.isFile = rawEntry.isFile;
-    entry.name = rawEntry.name;
-    entry.fullPath = rawEntry.fullPath;
-    entry.filesystem = new FileSystem(rawEntry.filesystemName || (rawEntry.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
-    entry.nativeURL = rawEntry.nativeURL;
-
-    return entry;
-}
-
-function injectCookieHandler(url, cb) {
-    return function(response) {
-        cookieHandler.setCookieFromString(url, resolveCookieString(response.headers));
-        cb(response);
-    }
-}
-
-function injectFileEntryHandler(cb) {
-    return function(response) {
-        cb(createFileEntry(response.file));
-    }
-}
-
-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');
-    }
-
-    if (Object.prototype.toString.call(failFn) !== '[object Function]') {
-        throw new Error('advanced-http: missing mandatory "onFail" callback function');
-    }
-}
-
-var http = {
-    headers: {},
-    dataSerializer: 'urlencoded',
-    sslPinning: false,
-    timeoutInSeconds: 60.0,
+var publicInterface = {
    getBasicAuthHeader: function (username, password) {
-        return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
+        return {'Authorization': 'Basic ' + helpers.b64EncodeUnicode(username + ':' + password)};
    },
    useBasicAuth: function (username, password) {
-        this.setHeader('*', 'Authorization', 'Basic ' + b64EncodeUnicode(username + ':' + password));
+        this.setHeader('*', 'Authorization', 'Basic ' + helpers.b64EncodeUnicode(username + ':' + password));
+    },
+    getHeaders: function (host) {
+        return internals.headers[host || '*'] || null;
    },
    setHeader: function () {
        // this one is for being backward compatible
@@ -165,20 +63,40 @@ var http = {
            value = arguments[2];
        }

-        this.headers[host] = this.headers[host] || {};
-        this.headers[host][header] = value;
+        if (header.toLowerCase() === 'cookie') {
+          throw new Error(messages.ADDING_COOKIES_NOT_SUPPORTED);
+        }
+
+        if (helpers.getTypeOf(value) !== 'String') {
+          throw new Error(messages.HEADER_VALUE_MUST_BE_STRING);
+        }
+
+        internals.headers[host] = internals.headers[host] || {};
+        internals.headers[host][header] = value;
+    },
+    getDataSerializer: function () {
+        return internals.dataSerializer;
    },
    setDataSerializer: function (serializer) {
-        this.dataSerializer = checkSerializer(serializer);
+        internals.dataSerializer = helpers.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) {
-        this.timeoutInSeconds = timeout;
+    getCookieString: function (url) {
+        return cookieHandler.getCookieString(url);
+    },
+    getRequestTimeout: function () {
+        return internals.timeoutInSeconds;
+    },
+    setRequestTimeout: function (timeout) {
+        internals.timeoutInSeconds = timeout;
    },
    enableSSLPinning: function (enable, success, failure) {
        return exec(success, failure, 'CordovaHttpPlugin', 'enableSSLPinning', [enable]);
@@ -186,103 +104,135 @@ 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) {
-        failure('advanced-http: "validateDomainName" is no more supported, please see change log for further info');
+        failure(messages.DEPRECATED_VDN);
    },
    post: function (url, data, headers, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

-        data = data || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        data = helpers.getProcessedData(data, internals.dataSerializer);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'post', [url, data, this.dataSerializer, headers, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'post', [url, data, internals.dataSerializer, headers, internals.timeoutInSeconds]);
    },
    get: function (url, params, headers, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

        params = params || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'get', [url, params, headers, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'get', [url, params, headers, internals.timeoutInSeconds]);
    },
    put: function (url, data, headers, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

-        data = data || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        data = helpers.getProcessedData(data, internals.dataSerializer);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'put', [url, data, this.dataSerializer, headers, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'put', [url, data, internals.dataSerializer, headers, internals.timeoutInSeconds]);
    },

    patch: function (url, data, headers, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

-        data = data || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        data = helpers.getProcessedData(data, internals.dataSerializer);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'patch', [url, data, this.dataSerializer, headers, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'patch', [url, data, internals.dataSerializer, headers, internals.timeoutInSeconds]);
    },

    delete: function (url, params, headers, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

        params = params || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'delete', [url, params, headers, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'delete', [url, params, headers, internals.timeoutInSeconds]);
    },
    head: function (url, params, headers, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

        params = params || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'head', [url, params, headers, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'head', [url, params, headers, internals.timeoutInSeconds]);
    },
    uploadFile: function (url, params, headers, filePath, name, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

        params = params || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, success);
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'uploadFile', [url, params, headers, filePath, name, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, success);
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'uploadFile', [url, params, headers, filePath, name, internals.timeoutInSeconds]);
    },
    downloadFile: function (url, params, headers, filePath, success, failure) {
-        handleMissingCallbacks(success, failure);
+        helpers.handleMissingCallbacks(success, failure);

        params = params || {};
-        headers = getMergedHeaders(url, headers, this.headers);
+        headers = helpers.getMergedHeaders(url, headers, internals.headers);

-        var onSuccess = injectCookieHandler(url, injectFileEntryHandler(success));
-        var onFail = injectCookieHandler(url, failure);
+        if (!helpers.checkHeaders(headers)) {
+          return helpers.onInvalidHeader(failure);
+        }

-        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'downloadFile', [url, params, headers, filePath, this.timeoutInSeconds]);
+        var onSuccess = helpers.injectCookieHandler(url, helpers.injectFileEntryHandler(success));
+        var onFail = helpers.injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'downloadFile', [url, params, headers, filePath, internals.timeoutInSeconds]);
    }
 };

-angularIntegration.registerService(http);
-module.exports = http;
+angularIntegration.registerService(publicInterface);
+module.exports = publicInterface;
@@ -1,4 +1,4 @@
-var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var pluginId = module.id.slice(0, module.id.lastIndexOf('.'));
 var ToughCookie = require(pluginId + '.tough-cookie');
 var WebStorageCookieStore = require(pluginId + '.local-storage-store');

@@ -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);
 }
@@ -0,0 +1,196 @@
+var pluginId = module.id.slice(0, module.id.lastIndexOf('.'));
+var cookieHandler = require(pluginId + '.cookie-handler');
+var messages = require(pluginId + '.messages');
+
+var validSerializers = [ 'urlencoded', 'json', 'utf8' ];
+
+module.exports = {
+  b64EncodeUnicode: b64EncodeUnicode,
+  getTypeOf: getTypeOf,
+  checkHeaders: checkHeaders,
+  onInvalidHeader: onInvalidHeader,
+  checkSerializer: checkSerializer,
+  injectCookieHandler: injectCookieHandler,
+  injectFileEntryHandler: injectFileEntryHandler,
+  getMergedHeaders: getMergedHeaders,
+  getProcessedData: getProcessedData,
+  handleMissingCallbacks: handleMissingCallbacks
+};
+
+// 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) {
+    return String.fromCharCode('0x' + p1);
+  }));
+}
+
+function mergeHeaders(globalHeaders, localHeaders) {
+  var globalKeys = Object.keys(globalHeaders);
+  var key;
+
+  for (var i = 0; i < globalKeys.length; i++) {
+    key = globalKeys[i];
+
+    if (!localHeaders.hasOwnProperty(key)) {
+      localHeaders[key] = globalHeaders[key];
+    }
+  }
+
+  return localHeaders;
+}
+
+function checkHeaders(headers) {
+  var keys = Object.keys(headers);
+  var key;
+
+  for (var i = 0; i < keys.length; i++) {
+    key = keys[i];
+
+    if (getTypeOf(headers[key]) !== 'String') {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+function onInvalidHeader(handler) {
+  handler({
+    status: 0,
+    error: messages.HEADER_VALUE_MUST_BE_STRING,
+    headers: {}
+  });
+}
+
+function checkSerializer(serializer) {
+  serializer = serializer || '';
+  serializer = serializer.trim().toLowerCase();
+
+  if (validSerializers.indexOf(serializer) > -1) {
+    return serializer;
+  }
+
+  return serializer[0];
+}
+
+function resolveCookieString(headers) {
+  var keys = Object.keys(headers || {});
+
+  for (var i = 0; i < keys.length; ++i) {
+    if (keys[i].match(/^set-cookie$/i)) {
+      return headers[keys[i]];
+    }
+  }
+
+  return null;
+}
+
+function createFileEntry(rawEntry) {
+  var entry = new (require('cordova-plugin-file.FileEntry'))();
+
+  entry.isDirectory = rawEntry.isDirectory;
+  entry.isFile = rawEntry.isFile;
+  entry.name = rawEntry.name;
+  entry.fullPath = rawEntry.fullPath;
+  entry.filesystem = new FileSystem(rawEntry.filesystemName || (rawEntry.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
+  entry.nativeURL = rawEntry.nativeURL;
+
+  return entry;
+}
+
+function injectCookieHandler(url, cb) {
+  return function(response) {
+    cookieHandler.setCookieFromString(url, resolveCookieString(response.headers));
+    cb(response);
+  }
+}
+
+function injectFileEntryHandler(cb) {
+  return function(response) {
+    cb(createFileEntry(response.file));
+  }
+}
+
+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;
+}
+
+// typeof is not working reliably in JS
+function getTypeOf(object) {
+  switch (Object.prototype.toString.call(object)) {
+    case '[object Array]':
+      return 'Array';
+    case '[object Boolean]':
+      return 'Boolean';
+    case '[object Function]':
+      return 'Function';
+    case '[object Null]':
+      return 'Null';
+    case '[object Number]':
+      return 'Number';
+    case '[object Object]':
+      return 'Object';
+    case '[object String]':
+      return 'String';
+    case '[object Undefined]':
+      return 'Undefined';
+    default:
+      return 'Unknown';
+  }
+}
+
+function getAllowedDataTypes(dataSerializer) {
+  switch (dataSerializer) {
+    case 'utf8':
+      return ['String'];
+    case 'urlencoded':
+      return ['Object'];
+    default:
+      return ['Array', 'Object'];
+  }
+}
+
+function getProcessedData(data, dataSerializer) {
+  data = data || {};
+
+  var currentDataType = getTypeOf(data);
+  var allowedDataTypes = getAllowedDataTypes(dataSerializer);
+
+  if (allowedDataTypes.indexOf(currentDataType) === -1) {
+    throw new Error(messages.DATA_TYPE_MISMATCH + ' ' + allowedDataTypes.join(', '));
+  }
+
+  if (dataSerializer === 'utf8') {
+    data = { text: data };
+  }
+
+  return data;
+}
+
+function handleMissingCallbacks(successFn, failFn) {
+  if (getTypeOf(successFn) !== 'Function') {
+    throw new Error(messages.MANDATORY_SUCCESS);
+  }
+
+  if (getTypeOf(failFn) !== 'Function') {
+    throw new Error(messages.MANDATORY_FAIL);
+  }
+}
@@ -30,7 +30,7 @@

 'use strict';

-var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var pluginId = module.id.slice(0, module.id.lastIndexOf('.'));
 var ToughCookie = require(pluginId + '.tough-cookie');
 var _ = require(pluginId + '.lodash');

@@ -0,0 +1,8 @@
+module.exports = {
+  ADDING_COOKIES_NOT_SUPPORTED: 'advanced-http: "setHeader" does not support adding cookies, please use "setCookie" function instead',
+  DATA_TYPE_MISMATCH: 'advanced-http: "data" argument supports only following data types:',
+  DEPRECATED_VDN: 'advanced-http: "validateDomainName" is no more supported, please see change log for further info',
+  HEADER_VALUE_MUST_BE_STRING: 'advanced-http: header values must be strings',
+  MANDATORY_SUCCESS: 'advanced-http: missing mandatory "onSuccess" callback function',
+  MANDATORY_FAIL: 'advanced-http: missing mandatory "onFail" callback function'
+};
Author	SHA1	Message	Date
Sefa Ilkimen	df86929148	release v1.10.0	2018-02-09 10:54:42 +01:00
Sefa Ilkimen	f691d09eb0	update docu and change log	2018-02-09 10:45:03 +01:00
Sefa Ilkimen	b68cbcd157	replace all typeof calls	2018-02-09 10:06:32 +01:00
Sefa Ilkimen	a9bdca2d6d	make internals private (not directly accessible via public interface)	2018-02-09 10:01:48 +01:00
Sefa Ilkimen	5186b375a4	feature #34 : add support for transfering raw string as utf-8 encoded data	2018-02-09 09:16:30 +01:00
Sefa Ilkimen	d28eedebd0	some refactoring: - new module for messages - new module for helper functions	2018-02-08 16:44:16 +01:00
Sefa Ilkimen	25b4a283ea	- add data type validation for data param - support strings as data when "utf8" serializer is configured	2018-02-07 18:24:39 +01:00
Sefa Ilkimen	ebef9a2944	Android: fix interface for "utf8" serializer	2018-02-07 16:57:48 +01:00
Sefa Ilkimen	c452b29433	WIP commit for iOS: - failure handler gets called if an exception occurs in native code - rename "raw" serializer to "utf8" - extract serializer into separate file	2018-02-07 16:31:51 +01:00
Sefa Ilkimen	60e7debbdf	Merge branch 'master' of https://github.com/robertocapuano/cordova-plugin-advanced-http into robertocapuano-master	2018-01-21 15:11:44 +01:00
Sefa Ilkimen	c7820c8185	release v1.9.1	2018-01-04 16:34:21 +01:00
Sefa Ilkimen	f6a15190f3	add another cookie spec to validate #59	2018-01-04 13:17:52 +01:00
Sefa Ilkimen	419283c5dd	add another spec for cookie handling	2018-01-04 04:10:30 +01:00
Sefa Ilkimen	7a8f9a0dba	add a spec for cookie handling	2018-01-04 03:53:39 +01:00
Sefa Ilkimen	64731a3794	fix #58 : white-list of allowed content-types should be removed for iOS	2018-01-04 02:05:55 +01:00
Sefa Ilkimen	73097b9db9	fix: bug fix #54 causes a bug on Android (success and failure handler are called both)	2018-01-04 01:23:49 +01:00
Sefa Ilkimen	a9c3be124e	fixed #54 : Requests are not responding on iOS with non-string values in header object	2018-01-04 00:40:40 +01:00
Roberto Capuano	5d5a859cfc	added 'raw' serializer	2017-12-12 16:42:03 +01:00
Sefa Ilkimen	d67e80dfe0	fix #45 : does not encode arrays correctly as HTTP GET parameter on Android	2017-11-26 03:42:22 +01:00
Sefa Ilkimen	55ba423d2f	update readme to include tough-cookie	2017-11-24 19:48:39 +01:00
Sefa Ilkimen	7f34201e8d	release v1.9.0	2017-11-24 19:26:03 +01:00
Sefa Ilkimen	01c43c4e29	throw an error when "setHeader" is used to add a custom cookie header	2017-11-24 19:14:14 +01:00
Sefa Ilkimen	d34196ff4e	feature #46 : support adding custom cookies	2017-11-24 18:47:00 +01:00
Sefa Ilkimen	1957cf4ef7	update change log	2017-11-24 17:46:44 +01:00
Sefa IlkimenandGitHub	681c384b3e	feature #43 : add support for Content-Type "application/javascript" Add support for Content-Type application/javascript	2017-11-23 01:03:33 +01:00
Sefa Ilkimen	9d6406277c	- feature #44 : expose "getCookieString" method - update version number	2017-11-16 23:22:29 +01:00
Sefa Ilkimen	b9bc1b0054	- update cordova (dev dependency) - pin version of cordova file plugin dependency (v4.3.3)	2017-11-13 17:47:35 +01:00
Sefa Ilkimen	d17f44b641	improve CI build error handling (do not continue when one of the commands fail)	2017-11-08 12:17:27 +01:00
Sefa Ilkimen	11515a8400	add tests for sending url encoded data	2017-11-08 11:57:33 +01:00
Sefa Ilkimen	937296b371	release v1.8.1	2017-11-08 11:17:53 +01:00
Thomas Opiolka	b60086df0d	Add support for Content-Type application/javascript	2017-11-08 11:16:42 +01:00
Sefa Ilkimen	a48a91dd14	add OS identifier for saucelabs tests	2017-11-08 11:15:32 +01:00
Sefa Ilkimen	e8a72a53cc	split CI build into two jobs	2017-11-08 10:29:59 +01:00
Sefa Ilkimen	efbdc21221	fix: ANDROID_HOME path for CI build	2017-11-07 18:30:42 +01:00
Sefa Ilkimen	06d7d859e7	update change log	2017-11-07 14:53:37 +01:00
Sefa Ilkimen	239b82c08e	enable saucelabs testing for android platform	2017-11-07 14:52:11 +01:00
Sefa Ilkimen	e987652d97	fix #40 : generic error codes are different on Android and iOS	2017-11-07 13:31:38 +01:00
Sefa Ilkimen	068b25b6f9	- fix #27 : "uploadFile" method doesn't return data object on iOS - update version number	2017-11-03 15:51:19 +01:00
Sefa Ilkimen	8c55572eb8	implement test for "downloadFile" method	2017-11-02 17:01:35 +01:00
Sefa Ilkimen	48afeefbc3	- update version number - update change log	2017-11-02 15:45:37 +01:00
Sefa Ilkimen	292d726b20	- feature #33 : response object contains response url - annotate tests with issue numbers - refactor android source code	2017-11-02 14:59:53 +01:00