release v1.6.2

- improved release process (using npm script)
- updated version number
2026-07-26 00:00:14 +08:00 · 2017-10-19 17:58:48 +02:00 · 2017-10-19 17:56:30 +02:00 · 2017-10-19 16:24:54 +02:00 · 2017-10-19 09:42:13 +02:00 · 2017-10-16 10:57:05 +02:00
48 changed files with 6680 additions and 417 deletions
@@ -1,2 +1,4 @@
+node_modules/**
 tags
-.zedstate
+.zedstate
+/temp
@@ -0,0 +1,5 @@
+tags
+.zedstate
+/scripts
+/temp
+/test
@@ -0,0 +1,43 @@
+sudo: false
+
+language: objective-c
+os: osx
+osx_image: xcode9.1
+
+cache: false
+
+addons:
+  sauce_connect:
+    username: silkimen
+  jwt: RZHC8x5ggrXdu1xzhhHmQDwege9s3putJXY1ZG8+MNMaBTLfLBWzFsHuR6Lvz+XnrAT/CTGG957kw6ikSaV6VEkGvtO91irZoJyShjPq2hBbn2CaEbo91Eq8iNYaRG+4FVMxoHa6xpF/HtvOLQdIkURc/lzLj/BOFMmtV/d3adLDcryQZuYB211iN4d6exGHMQe8uvJdkCy4ac85guhF8KmAELyaVa0rx0m6gNaszWU9BJ8Rn+4HJbJtfpQcU1bJN43Dx8forRU/Com53K+KFtDKPUdBHZnuENrZrQ+8RU59vdLrHwsCvP9elJFkcX9xk/r45oUGXhqVV3vMyaqTa9YUO772rhgKuAi4TqiaR51H58KWqynp7wOZwL5FqJs0KzL5rNDDIoKKrklnOidS4RAUKXCi1CUNXwDdOo4Kd96cYOIHqpwa7Beci8CtVlzd/49yE9/AXnZYVwp10uKZvJJdliAOHhVEAtCIp8PzHOOPYJsXvUcEU4ORWWWpusBAz6wFiLOL4d/CAHNj6wDFliRexBrv/Wunu5ifva4oVJWrtAtyGDtsX8kBkf8OcIdy/aPUIIBrbW1sapjPFymMGeL/KkSZRjEy7KjFZKZh9L7sJE56sq+IUremFbcyaX1E3rho6Cs3ongLaKhL9f9vz8EFs7//w8pNlNS9EUdOU68=
+
+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
+
+script:
+- travis_wait scripts/build-test-app.sh
+- scripts/upload-artifact.sh
+- scripts/test.sh --ios --emulator
+
+after_success:
+
+deploy:
+
+notifications:
+  slack:
+    secure: lXE+2AgsxZU5G5dI91LkMAIgo8MAWfdM7DB5UOtn5LpuNln+2FmJo1gOI7tkdmLOqpXTGYnpI2VyQN3H4nOF21YhuouzD1Sh8n2wtQg1iTm353kuQpqiVhSBX8ZJ7Be1e1G8OsnxoYOxbs4Zo9qI40EruwkvqLCBHWM5MRGyd4M7EFWwb9Z29VZN0y1Nt5g/c3bT76kdKmF+JCLur2OeEKxAity7sIKgZekSqeIMwEVLSxXnda6Dbjc/cg0MJ0iDArkD7iu6fz/Fcrrxgm/pUxjcgvqze7Gy5i31mjEfspnrglWV1cshMd48BTDKCJ2AMmxH8O3GPSWE2txjIvGRWUve7iViNylvmQCVz3Eyf99+4EuuVGa+5PSodQ/CqODx/65EwtcN3PE1tNz2puKOK8nrOJcFkcbG8KTHKUlQtHCkjitbykUnj/hvhLK5/oWlQYVOLWWrHwdGUh8FI8aFPVGjRjWbHbhdayjEIqxwr1ns+6mYrP1EFNXbaeZxnLNC59XpJl1ifuezqYAk7YEiU5j4rtC7YKgyQ3ueb7anOHTJoTMyDn8mpZXgwuyhoBaeEYytQVgRyMtL6Y5cP98Jn2kv0+vdne3rkk9/JEBTo32HOjvoij6rsqEvXC0LhUDJSNadOVdHht0jjoN6zBH37HIE5/3zysLlPcAcHAS83ow=
@@ -1,5 +1,77 @@
 # Changelog

+## v1.6.2
+
+- Change #29: removed "validateDomainName" (see info notice)
+- Fixed #31: request fails throwing error on erroneous cookies
+- Fixed #28: added support for content type "application/hal+json" on iOS (thanks ryandegruyter)
+
+#### Important information
+We've decided to remove the `validateDomainName()` method, because people were complaining that `acceptAllCerts(true)` is not behaving as expected. And also it's not a good idea to disable domain name validation while using valid certs, because it pretends having a secure connection, but it isn't.
+
+You should either use valid certs with domain name validation enabled (safe for production use) or accept any certs without domain name validation (only for private dev environments). I strongly discourage using fake certs in public networks.
+
+Therefore we are disabling domain name validation automatically, when you set `acceptAllCerts(true)`. So if you were using `validateDomainName()` function, you need to remove this function call for v1.6.2+.
+
+## v1.6.1
+
+- Fixed #23: PATCH method broken on android
+
+## v1.6.0
+
+- Feature #18: implemented PATCH method (thanks akhatri for android implementation)
+- Feature #21: added redirection control (thanks to notsyncing and kesozjura)
+- Fixed #16: cordova tries to run build script during plugin install
+
+## v1.5.10
+
+- Fixed #10: fix gzip decompression when request header accepts gzip compression (thanks to DayBr3ak)
+- Fixed #13: fix angular integration for `setDataSerializer` (thanks to RangerRick)
+- Added some missing documentation (thanks to RangerRick)
+
+## v1.5.9
+
+- Fixed case-sensitive folder name of Android source files
+
+## v1.5.8
+
+- Use the same error codes if a request timed out
+
+## v1.5.7
+
+- Fixed a bug in cookie handling (cookies containing an "Expires" string)
+- Added setRequestTimeout function to set the timeout in seconds for all further requests
+
+## v1.5.6
+
+- All response header keys are converted to lowercase (iOS only)
+
+## v1.5.5
+
+- added a function to remove all cookies for a URL
+
+## v1.5.4
+
+- fixed an error if the response has no "headers" field
+
+## v1.5.3
+
+- handles cookies correctly on non-success response from server
+- throws error when a callback function is missing
+
+## v1.5.2
+
+- fixed missing file "umd-tough-cookie.js“ (caused by missing file ".npmignore")
+
+## v1.5.1
+
+- fixed case-sensitive path name of android source files ("CordovaHTTP" --> "cordovahttp")
+
+## v1.5.0
+
+- added cookie handling
+- cookies are persisted via web storage API
+
 ## v1.4.0

 - forked from "cordova-plugin-http" v1.2.0 (see https://github.com/wymsee/cordova-HTTP)
@@ -1,5 +1,6 @@
 The MIT License (MIT)

+Copyright (c) 2017 Mobisys GmbH
 Copyright (c) 2014 Wymsee, Inc

 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -18,4 +19,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
@@ -1,5 +1,10 @@
 Cordova Advanced HTTP
 =====================
+[![npm version](https://badge.fury.io/js/cordova-plugin-advanced-http.svg)](https://badge.fury.io/js/cordova-plugin-advanced-http)
+[![downloads/month](https://img.shields.io/npm/dm/cordova-plugin-advanced-http.svg)](https://www.npmjs.com/package/cordova-plugin-advanced-http)
+[![MIT Licence](https://badges.frapsoft.com/os/mit/mit.png)](https://opensource.org/licenses/mit-license.php)
+[![Build Status](https://travis-ci.org/silkimen/cordova-plugin-advanced-http.svg?branch=master)](https://travis-ci.org/silkimen/cordova-plugin-advanced-http)
+

 Cordova / Phonegap plugin for communicating with HTTP servers.  Supports iOS and Android.
 This is a fork of [Wymsee's Cordova-HTTP plugin](https://github.com/wymsee/cordova-HTTP).
@@ -55,6 +60,11 @@ Set a header for all future requests.  Takes a header and a value.

    cordovaHTTP.setHeader("Header", "Value");

+### disableRedirect
+If set to `true`, it won't follow redirects automatically. This is a global setting.
+
+    cordovaHTTP.disableRedirect(true);
+
 ### setDataSerializer
 Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.

@@ -66,6 +76,15 @@ You can choose one of these two:

 Caution: `urlencoded` does not support serializing deep structures whereas `json` does.

+### setRequestTimeout
+Set how long to wait for a request to respond, in seconds.
+
+    cordovaHTTP.setRequestTimeout(5.0);
+
+### clearCookies
+Clear the cookie store.
+
+    cordovaHTTP.clearCookies();

 ## Asynchronous Functions
 These functions all take success and error callbacks as their last 2 arguments.
@@ -93,13 +112,12 @@ Accept all SSL certificates.  Or disable accepting all certificates.  This defau
    });

 ### validateDomainName
-Whether or not to validate the domain name in the certificate.  This defaults to true.
+This function was removed in v1.6.2. Domain name validation is disabled automatically when you enable "acceptAllCerts".

-    cordovaHTTP.validateDomainName(false, function() {
-        console.log('success!');
-    }, function() {
-        console.log('error :(');
-    });
+### removeCookies
+Remove all cookies associated with a given URL.
+
+    cordovaHTTP.removeCookies(url);

 ### post<a name="post"></a>
 Execute a POST request.  Takes a URL, data, and headers.
@@ -168,6 +186,9 @@ Execute a PUT request.  Takes a URL, data, and headers.  See the [post](#post) d
 ### delete
 Execute a DELETE request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.

+### head
+Execute a HEAD request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
+
 ### uploadFile
 Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath, and the name of the parameter to pass the file along as.  See the [post](#post) documentation for details on what is returned on success and failure.

@@ -199,27 +220,9 @@ Downloads a file and saves it to the device.  Takes a URL, parameters, headers,

 ## Libraries

-This plugin utilizes some awesome open source networking libraries.  These are both MIT licensed:
+This plugin utilizes some awesome open source networking libraries. These are both MIT licensed:

 - iOS - [AFNetworking](https://github.com/AFNetworking/AFNetworking)
 - Android - [http-request](https://github.com/kevinsawicki/http-request)

-We made a few modifications to http-request.  They can be found in a separate repo here: https://github.com/wymsee/http-request
-
-## Cookies
-
- a cookie set by a request isn't sent in subsequent requests
-
-Take this into account when using this plugin in your application.
-
-## License
-
-The MIT License
-
-Copyright (c) 2014 Wymsee, Inc
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+We made a few modifications to both of them.
@@ -1,7 +1,11 @@
 {
  "name": "cordova-plugin-advanced-http",
-  "version": "1.4.0",
+  "version": "1.6.2",
  "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
+  "scripts": {
+    "test": "./scripts/build-test-app.sh && ./scripts/test.sh --ios --emulator",
+    "release": "npm run test && ./scripts/release.sh"
+  },
  "cordova": {
    "id": "cordova-plugin-advanced-http",
    "platforms": [
@@ -25,7 +29,7 @@
  "engines": [
    {
      "name": "cordova",
-      "version": ">=3.0.0"
+      "version": ">=4.0.0"
    }
  ],
  "author": "Wymsee",
@@ -44,5 +48,16 @@
  "bugs": {
    "url": "https://github.com/silkimen/cordova-plugin-advanced-http/issues"
  },
-  "homepage": "https://github.com/silkimen/cordova-plugin-advanced-http#readme"
+  "homepage": "https://github.com/silkimen/cordova-plugin-advanced-http#readme",
+  "devDependencies": {
+    "chai": "4.1.2",
+    "chai-as-promised": "7.1.1",
+    "colors": "1.1.2",
+    "cordova": "7.0.1",
+    "mocha": "4.0.0",
+    "mz": "2.7.0",
+    "umd-tough-cookie": "2.3.2",
+    "wd": "1.4.1",
+    "xml2js": "0.4.19"
+  }
 }
@@ -1,85 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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.4.0">
-
-    <name>Advanced HTTP plugin</name>
-
-    <description>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="1.6.2">
+  <name>Advanced HTTP plugin</name>
+  <description>
        Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning
 	 </description>
-
-    <engines>
-        <engine name="cordova" version=">=3.5.0" />
-    </engines>
-
-    <dependency id="cordova-plugin-file" version=">=2.0.0" />
-
-    <js-module src="www/cordovaHttp.js" name="http">
-        <clobbers target="cordova.plugin.http" />
-    </js-module>
-
-    <!-- ios -->
-    <platform name="ios">
-        <config-file target="config.xml" parent="/*">
-            <feature name="CordovaHttpPlugin">
-                <param name="ios-package" value="CordovaHttpPlugin"/>
-            </feature>
-        </config-file>
-
-        <header-file src="src/ios/CordovaHttpPlugin.h" />
-        <source-file src="src/ios/CordovaHttpPlugin.m" />
-
-        <header-file src="src/ios/TextResponseSerializer.h" />
-        <source-file src="src/ios/TextResponseSerializer.m" />
-
-        <header-file src="src/ios/AFNetworking/AFHTTPSessionManager.h" />
-        <source-file src="src/ios/AFNetworking/AFHTTPSessionManager.m" />
-
-        <header-file src="src/ios/AFNetworking/AFNetworking.h" />
-
-        <header-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.h" />
-        <source-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.m" />
-
-        <header-file src="src/ios/AFNetworking/AFSecurityPolicy.h" />
-        <source-file src="src/ios/AFNetworking/AFSecurityPolicy.m" />
-
-        <header-file src="src/ios/AFNetworking/AFURLRequestSerialization.h" />
-        <source-file src="src/ios/AFNetworking/AFURLRequestSerialization.m" />
-
-        <header-file src="src/ios/AFNetworking/AFURLResponseSerialization.h" />
-        <source-file src="src/ios/AFNetworking/AFURLResponseSerialization.m" />
-
-        <header-file src="src/ios/AFNetworking/AFURLSessionManager.h" />
-        <source-file src="src/ios/AFNetworking/AFURLSessionManager.m" />
-
-        <framework src="Security.framework" />
-        <framework src="SystemConfiguration.framework" />
-    </platform>
-
-    <!--android -->
-    <platform name="android">
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="CordovaHttpPlugin">
-                <param name="android-package" value="com.synconset.cordovahttp.CordovaHttpPlugin"/>
-            </feature>
-        </config-file>
-
-        <config-file target="AndroidManifest.xml" parent="/manifest">
-            <uses-permission android:name="android.permission.INTERNET" />
-        </config-file>
-
-        <source-file src="src/android/com/github/kevinsawicki/http/HttpRequest.java" target-dir="src/com/github/kevinsawicki/http" />
-        <source-file src="src/android/com/github/kevinsawicki/http/TLSSocketFactory.java" target-dir="src/com/github/kevinsawicki/http" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttp.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDelete.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDownload.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpGet.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpHead.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPost.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPut.java" target-dir="src/com/synconset/cordovahttp" />
-        <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpUpload.java" target-dir="src/com/synconset/cordovahttp" />
-    </platform>
-</plugin>
+  <engines>
+    <engine name="cordova" version=">=4.0.0"/>
+  </engines>
+  <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/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/advanced-http.js" name="http">
+    <clobbers target="cordova.plugin.http"/>
+  </js-module>
+  <platform name="ios">
+    <config-file target="config.xml" parent="/*">
+      <feature name="CordovaHttpPlugin">
+        <param name="ios-package" value="CordovaHttpPlugin"/>
+      </feature>
+    </config-file>
+    <header-file src="src/ios/CordovaHttpPlugin.h"/>
+    <header-file src="src/ios/TextResponseSerializer.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"/>
+    <header-file src="src/ios/AFNetworking/AFSecurityPolicy.h"/>
+    <header-file src="src/ios/AFNetworking/AFURLRequestSerialization.h"/>
+    <header-file src="src/ios/AFNetworking/AFURLResponseSerialization.h"/>
+    <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/AFNetworking/AFHTTPSessionManager.m"/>
+    <source-file src="src/ios/AFNetworking/AFNetworkReachabilityManager.m"/>
+    <source-file src="src/ios/AFNetworking/AFSecurityPolicy.m"/>
+    <source-file src="src/ios/AFNetworking/AFURLRequestSerialization.m"/>
+    <source-file src="src/ios/AFNetworking/AFURLResponseSerialization.m"/>
+    <source-file src="src/ios/AFNetworking/AFURLSessionManager.m"/>
+    <framework src="Security.framework"/>
+    <framework src="SystemConfiguration.framework"/>
+  </platform>
+  <platform name="android">
+    <config-file target="res/xml/config.xml" parent="/*">
+      <feature name="CordovaHttpPlugin">
+        <param name="android-package" value="com.synconset.cordovahttp.CordovaHttpPlugin"/>
+      </feature>
+    </config-file>
+    <config-file target="AndroidManifest.xml" parent="/manifest">
+      <uses-permission android:name="android.permission.INTERNET"/>
+    </config-file>
+    <source-file src="src/android/com/github/kevinsawicki/http/HttpRequest.java" target-dir="src/com/github/kevinsawicki/http"/>
+    <source-file src="src/android/com/github/kevinsawicki/http/TLSSocketFactory.java" target-dir="src/com/github/kevinsawicki/http"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttp.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDelete.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpDownload.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpGet.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpHead.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPlugin.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPost.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPut.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpPatch.java" target-dir="src/com/synconset/cordovahttp"/>
+    <source-file src="src/android/com/synconset/cordovahttp/CordovaHttpUpload.java" target-dir="src/com/synconset/cordovahttp"/>
+  </platform>
+</plugin>
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -e
+
+PLATFORM=$([[ "${@#--android}" = "$@" ]] && echo "ios" || echo "android")
+TARGET=$([[ "${@#--device}" = "$@" ]] && echo "emulator" || echo "device")
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+CDV=$ROOT/node_modules/.bin/cordova
+
+rm -rf $ROOT/temp
+mkdir $ROOT/temp
+cp -r $ROOT/test/app-template/ $ROOT/temp/
+cp $ROOT/test/test-definitions.js $ROOT/temp/www/js/
+cd $ROOT/temp
+$CDV prepare
+$CDV plugins add $ROOT
+$CDV build $PLATFORM --$TARGET
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+pushd $ROOT
+VERSION=$(node -e "console.log(require('./package.json').version)")
+./scripts/update-tough-cookie.sh
+node ./scripts/update-plugin-xml.js $VERSION
+git commit -a -m "release v$VERSION"
+git tag "v$VERSION"
+npm publish
+popd
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+pushd $ROOT
+./node_modules/.bin/mocha ./test/mocha-specs/test.js "$@"
+popd
@@ -0,0 +1,31 @@
+const args = process.argv.slice(2);
+const fs = require('mz/fs');
+const path = require('path');
+const xml2js = require('xml2js');
+const xmlPath = path.join(__dirname, '..', 'plugin.xml');
+
+const parse = xml => new Promise((resolve, reject) => {
+  const parser = new xml2js.Parser();
+
+  parser.parseString(xml, (error, result) => {
+    if (error) {
+      reject(error);
+    } else {
+      resolve(result);
+    }
+  });
+});
+
+const stringify = obj => {
+  const builder = new xml2js.Builder();
+
+  return builder.buildObject(obj);
+};
+
+fs.readFile(xmlPath, 'utf-8')
+  .then(xml => parse(xml))
+  .then(parsed => {
+    parsed.plugin.$.version = args[0];
+
+    return fs.writeFile(xmlPath, stringify(parsed));
+  });
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -e
+
+ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"/..
+
+cd $ROOT
+npm i
+cp node_modules/umd-tough-cookie/lib/umd-tough-cookie.js www/umd-tough-cookie.js
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -e
+
+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
+
+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
@@ -236,6 +236,11 @@ public class HttpRequest {
   */
  public static final String METHOD_POST = "POST";

+  /**
+   * 'PATCH' request method
+   */
+  public static final String METHOD_PATCH = "PATCH";
+
  /**
   * 'PUT' request method
   */
@@ -1176,6 +1181,70 @@ public class HttpRequest {
    return post(encode ? encode(url) : url);
  }

+/**
+   * Start a 'PATCH' request to the given URL
+   *
+   * @param url
+   * @return request
+   * @throws HttpRequestException
+   */
+  public static HttpRequest patch(final CharSequence url)
+      throws HttpRequestException {
+    return new HttpRequest(url, METHOD_PATCH);
+  }
+
+  /**
+   * Start a 'PATCH' request to the given URL
+   *
+   * @param url
+   * @return request
+   * @throws HttpRequestException
+   */
+  public static HttpRequest patch(final URL url) throws HttpRequestException {
+    return new HttpRequest(url, METHOD_PATCH);
+  }
+
+  /**
+   * Start a 'PATCH' request to the given URL along with the query params
+   *
+   * @param baseUrl
+   * @param params
+   *          the query parameters to include as part of the baseUrl
+   * @param encode
+   *          true to encode the full URL
+   *
+   * @see #append(CharSequence, Map)
+   * @see #encode(CharSequence)
+   *
+   * @return request
+   */
+  public static HttpRequest patch(final CharSequence baseUrl,
+      final Map<?, ?> params, final boolean encode) {
+    String url = append(baseUrl, params);
+    return patch(encode ? encode(url) : url);
+  }
+
+  /**
+   * Start a 'PATCH' request to the given URL along with the query params
+   *
+   * @param baseUrl
+   * @param encode
+   *          true to encode the full URL
+   * @param params
+   *          the name/value query parameter pairs to include as part of the
+   *          baseUrl
+   *
+   * @see #append(CharSequence, Object...)
+   * @see #encode(CharSequence)
+   *
+   * @return request
+   */
+  public static HttpRequest patch(final CharSequence baseUrl,
+      final boolean encode, final Object... params) {
+    String url = append(baseUrl, params);
+    return patch(encode ? encode(url) : url);
+  }
+
  /**
   * Start a 'PUT' request to the given URL
   *
@@ -14,6 +14,8 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.Iterator;

+import android.text.TextUtils;
+
 import com.github.kevinsawicki.http.HttpRequest;

 abstract class CordovaHttp {
@@ -23,26 +25,30 @@ abstract class CordovaHttp {
    private static AtomicBoolean sslPinning = new AtomicBoolean(false);
    private static AtomicBoolean acceptAllCerts = new AtomicBoolean(false);
    private static AtomicBoolean validateDomainName = new AtomicBoolean(true);
+    private static AtomicBoolean disableRedirect = new AtomicBoolean(false);

    private String urlString;
    private JSONObject params;
    private String serializerName;
    private JSONObject headers;
+    private int timeoutInMilliseconds;
    private CallbackContext callbackContext;

-    public CordovaHttp(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext) {
+    public CordovaHttp(String urlString, JSONObject params, JSONObject headers, int timeout, CallbackContext callbackContext) {
        this.urlString = urlString;
        this.params = params;
        this.serializerName = "default";
        this.headers = headers;
+        this.timeoutInMilliseconds = timeout;
        this.callbackContext = callbackContext;
    }

-    public CordovaHttp(String urlString, JSONObject params, String serializerName, JSONObject headers, CallbackContext callbackContext) {
+    public CordovaHttp(String urlString, JSONObject params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
        this.urlString = urlString;
        this.params = params;
        this.serializerName = serializerName;
        this.headers = headers;
+        this.timeoutInMilliseconds = timeout;
        this.callbackContext = callbackContext;
    }

@@ -64,6 +70,10 @@ abstract class CordovaHttp {
        validateDomainName.set(accept);
    }

+    public static void disableRedirect(boolean disable) {
+        disableRedirect.set(disable);
+    }
+
    protected String getUrlString() {
        return this.urlString;
    }
@@ -88,6 +98,10 @@ abstract class CordovaHttp {
        return this.getStringMapFromJSONObject(this.headers);
    }

+    protected int getRequestTimeout() {
+        return this.timeoutInMilliseconds;
+    }
+
    protected CallbackContext getCallbackContext() {
        return this.callbackContext;
    }
@@ -105,6 +119,13 @@ abstract class CordovaHttp {
        return request;
    }

+    protected HttpRequest setupRedirect(HttpRequest request) {
+        if (disableRedirect.get()) {
+            request.followRedirects(false);
+        }
+        return request;
+    }
+
    protected void respondWithError(int status, String msg) {
        try {
            JSONObject response = new JSONObject();
@@ -122,15 +143,18 @@ abstract class CordovaHttp {

    protected void addResponseHeaders(HttpRequest request, JSONObject response) throws JSONException {
        Map<String, List<String>> headers = request.headers();
-        Map<String, String> parsed_headers = new HashMap<String, String>();
+        Map<String, String> filteredHeaders = new HashMap<String, String>();
+
        for (Map.Entry<String, List<String>> entry : headers.entrySet()) {
            String key = entry.getKey();
            List<String> value = entry.getValue();
+
            if ((key != null) && (!value.isEmpty())) {
-                parsed_headers.put(key, value.get(0));
+                filteredHeaders.put(key, TextUtils.join(", ", value));
            }
        }
-        response.put("headers", new JSONObject(parsed_headers));
+
+        response.put("headers", new JSONObject(filteredHeaders));
    }

    protected HashMap<String, String> getStringMapFromJSONObject(JSONObject object) throws JSONException {
@@ -3,6 +3,7 @@
 */
 package com.synconset.cordovahttp;

+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;

 import javax.net.ssl.SSLHandshakeException;
@@ -16,8 +17,8 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;

 class CordovaHttpDelete extends CordovaHttp implements Runnable {
-    public CordovaHttpDelete(String urlString, JSONObject data, JSONObject headers, CallbackContext callbackContext) {
-        super(urlString, data, headers, callbackContext);
+    public CordovaHttpDelete(String urlString, JSONObject data, JSONObject headers, int timeout, CallbackContext callbackContext) {
+        super(urlString, data, headers, timeout, callbackContext);
    }

    @Override
@@ -25,9 +26,12 @@ class CordovaHttpDelete extends CordovaHttp implements Runnable {
        try {
            HttpRequest request = HttpRequest.delete(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);
@@ -48,6 +52,8 @@ class CordovaHttpDelete extends CordovaHttp implements Runnable {
        } 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 {
@@ -7,6 +7,7 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;

 import java.io.File;
+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -22,8 +23,8 @@ import org.json.JSONObject;
 class CordovaHttpDownload extends CordovaHttp implements Runnable {
    private String filePath;

-    public CordovaHttpDownload(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext, String filePath) {
-        super(urlString, params, headers, callbackContext);
+    public CordovaHttpDownload(String urlString, JSONObject params, JSONObject headers, String filePath, int timeout, CallbackContext callbackContext) {
+        super(urlString, params, headers, timeout, callbackContext);
        this.filePath = filePath;
    }

@@ -31,9 +32,13 @@ class CordovaHttpDownload extends CordovaHttp implements Runnable {
    public void run() {
        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();

            JSONObject response = new JSONObject();
@@ -57,6 +62,8 @@ class CordovaHttpDownload extends CordovaHttp implements Runnable {
        } 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 {
@@ -3,6 +3,7 @@
 */
 package com.synconset.cordovahttp;

+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;

 import javax.net.ssl.SSLHandshakeException;
@@ -16,8 +17,8 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;

 class CordovaHttpGet extends CordovaHttp implements Runnable {
-    public CordovaHttpGet(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext) {
-        super(urlString, params, headers, callbackContext);
+    public CordovaHttpGet(String urlString, JSONObject params, JSONObject headers, int timeout, CallbackContext callbackContext) {
+        super(urlString, params, headers, timeout, callbackContext);
    }

    @Override
@@ -25,9 +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);
@@ -48,6 +52,8 @@ class CordovaHttpGet extends CordovaHttp implements Runnable {
        } 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 {
@@ -3,6 +3,7 @@
 */
 package com.synconset.cordovahttp;

+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;

 import javax.net.ssl.SSLHandshakeException;
@@ -15,8 +16,8 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;

 class CordovaHttpHead extends CordovaHttp implements Runnable {
-    public CordovaHttpHead(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext) {
-        super(urlString, params, headers, callbackContext);
+    public CordovaHttpHead(String urlString, JSONObject params, JSONObject headers, int timeout, CallbackContext callbackContext) {
+        super(urlString, params, headers, timeout, callbackContext);
    }

    @Override
@@ -24,9 +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();
@@ -47,6 +51,8 @@ class CordovaHttpHead extends CordovaHttp implements Runnable {
        } 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 {
@@ -0,0 +1,70 @@
+/**
+ * A HTTP plugin for Cordova / Phonegap
+ */
+package com.synconset.cordovahttp;
+
+import java.net.SocketTimeoutException;
+import java.net.UnknownHostException;
+
+import org.apache.cordova.CallbackContext;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import javax.net.ssl.SSLHandshakeException;
+
+import com.github.kevinsawicki.http.HttpRequest;
+import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;
+
+class CordovaHttpPatch extends CordovaHttp implements Runnable {
+    public CordovaHttpPatch(String urlString, JSONObject params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+        super(urlString, params, serializerName, headers, timeout, callbackContext);
+    }
+
+    @Override
+    public void run() {
+        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");
+        } 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");
+            }
+        }
+    }
+}
@@ -39,14 +39,16 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            JSONObject params = args.getJSONObject(1);
            String serializerName = args.getString(2);
            JSONObject headers = args.getJSONObject(3);
-            CordovaHttpPost post = new CordovaHttpPost(urlString, params, serializerName, headers, callbackContext);
+            int timeoutInMilliseconds = args.getInt(4) * 1000;
+            CordovaHttpPost post = new CordovaHttpPost(urlString, params, serializerName, headers, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(post);
        } else if (action.equals("get")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            CordovaHttpGet get = new CordovaHttpGet(urlString, params, headers, callbackContext);
+            int timeoutInMilliseconds = args.getInt(3) * 1000;
+            CordovaHttpGet get = new CordovaHttpGet(urlString, params, headers, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(get);
        } else if (action.equals("put")) {
@@ -54,21 +56,34 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            JSONObject params = args.getJSONObject(1);
            String serializerName = args.getString(2);
            JSONObject headers = args.getJSONObject(3);
-            CordovaHttpPut put = new CordovaHttpPut(urlString, params, serializerName, headers, callbackContext);
+            int timeoutInMilliseconds = args.getInt(4) * 1000;
+            CordovaHttpPut put = new CordovaHttpPut(urlString, params, serializerName, headers, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(put);
-        } else if (action.equals("delete")) {
+        } else if (action.equals("patch")) {
+            String urlString = args.getString(0);
+            JSONObject params = args.getJSONObject(1);
+            String serializerName = args.getString(2);
+            JSONObject headers = args.getJSONObject(3);
+            int timeoutInMilliseconds = args.getInt(4) * 1000;
+            CordovaHttpPatch patch = new CordovaHttpPatch(urlString, params, serializerName, headers, timeoutInMilliseconds, callbackContext);
+
+            cordova.getThreadPool().execute(patch);
+        }
+         else if (action.equals("delete")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            CordovaHttpDelete delete = new CordovaHttpDelete(urlString, params, headers, callbackContext);
+            int timeoutInMilliseconds = args.getInt(3) * 1000;
+            CordovaHttpDelete delete = new CordovaHttpDelete(urlString, params, headers, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(delete);
        } else if (action.equals("head")) {
            String urlString = args.getString(0);
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
-            CordovaHttpHead head = new CordovaHttpHead(urlString, params, headers, callbackContext);
+            int timeoutInMilliseconds = args.getInt(3) * 1000;
+            CordovaHttpHead head = new CordovaHttpHead(urlString, params, headers, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(head);
        } else if (action.equals("enableSSLPinning")) {
@@ -84,11 +99,7 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            boolean accept = args.getBoolean(0);

            CordovaHttp.acceptAllCerts(accept);
-            callbackContext.success();
-        } else if (action.equals("validateDomainName")) {
-            boolean accept = args.getBoolean(0);
-
-            CordovaHttp.validateDomainName(accept);
+            CordovaHttp.validateDomainName(!accept);
            callbackContext.success();
        } else if (action.equals("uploadFile")) {
            String urlString = args.getString(0);
@@ -96,7 +107,8 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            JSONObject headers = args.getJSONObject(2);
            String filePath = args.getString(3);
            String name = args.getString(4);
-            CordovaHttpUpload upload = new CordovaHttpUpload(urlString, params, headers, callbackContext, filePath, name);
+            int timeoutInMilliseconds = args.getInt(5) * 1000;
+            CordovaHttpUpload upload = new CordovaHttpUpload(urlString, params, headers, filePath, name, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(upload);
        } else if (action.equals("downloadFile")) {
@@ -104,9 +116,14 @@ public class CordovaHttpPlugin extends CordovaPlugin {
            JSONObject params = args.getJSONObject(1);
            JSONObject headers = args.getJSONObject(2);
            String filePath = args.getString(3);
-            CordovaHttpDownload download = new CordovaHttpDownload(urlString, params, headers, callbackContext, filePath);
+            int timeoutInMilliseconds = args.getInt(4) * 1000;
+            CordovaHttpDownload download = new CordovaHttpDownload(urlString, params, headers, filePath, timeoutInMilliseconds, callbackContext);

            cordova.getThreadPool().execute(download);
+        } else if (action.equals("disableRedirect")) {
+           boolean disable = args.getBoolean(0);
+           CordovaHttp.disableRedirect(disable);
+           callbackContext.success();
        } else {
            return false;
        }
@@ -3,6 +3,7 @@
 */
 package com.synconset.cordovahttp;

+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;

 import org.apache.cordova.CallbackContext;
@@ -15,8 +16,8 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;

 class CordovaHttpPost extends CordovaHttp implements Runnable {
-    public CordovaHttpPost(String urlString, JSONObject params, String serializerName, JSONObject headers, CallbackContext callbackContext) {
-        super(urlString, params, serializerName, headers, callbackContext);
+    public CordovaHttpPost(String urlString, JSONObject params, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+        super(urlString, params, serializerName, headers, timeout, callbackContext);
    }

    @Override
@@ -24,9 +25,12 @@ 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);
@@ -51,9 +55,11 @@ class CordovaHttpPost extends CordovaHttp implements Runnable {
            }
        } catch (JSONException e) {
            this.respondWithError("There was an error generating the response");
-        }  catch (HttpRequestException e) {
+        } 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 {
@@ -3,6 +3,7 @@
 */
 package com.synconset.cordovahttp;

+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;

 import org.apache.cordova.CallbackContext;
@@ -15,8 +16,8 @@ import com.github.kevinsawicki.http.HttpRequest;
 import com.github.kevinsawicki.http.HttpRequest.HttpRequestException;

 class CordovaHttpPut extends CordovaHttp implements Runnable {
-    public CordovaHttpPut(String urlString, JSONObject data, String serializerName, JSONObject headers, CallbackContext callbackContext) {
-        super(urlString, data, serializerName, headers, callbackContext);
+    public CordovaHttpPut(String urlString, JSONObject data, String serializerName, JSONObject headers, int timeout, CallbackContext callbackContext) {
+        super(urlString, data, serializerName, headers, timeout, callbackContext);
    }

    @Override
@@ -24,9 +25,12 @@ 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);
@@ -54,6 +58,8 @@ class CordovaHttpPut extends CordovaHttp implements Runnable {
        }  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 {
@@ -5,6 +5,7 @@ package com.synconset.cordovahttp;

 import java.io.File;

+import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -29,8 +30,8 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
    private String filePath;
    private String name;

-    public CordovaHttpUpload(String urlString, JSONObject params, JSONObject headers, CallbackContext callbackContext, String filePath, String name) {
-        super(urlString, params, headers, callbackContext);
+    public CordovaHttpUpload(String urlString, JSONObject params, JSONObject headers, String filePath, String name, int timeout, CallbackContext callbackContext) {
+        super(urlString, params, headers, timeout, callbackContext);
        this.filePath = filePath;
        this.name = name;
    }
@@ -40,9 +41,12 @@ 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);

            URI uri = new URI(filePath);

@@ -96,6 +100,8 @@ class CordovaHttpUpload extends CordovaHttp implements Runnable {
        }  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 {
@@ -6,10 +6,11 @@

 - (void)enableSSLPinning:(CDVInvokedUrlCommand*)command;
 - (void)acceptAllCerts:(CDVInvokedUrlCommand*)command;
- (void)validateDomainName:(CDVInvokedUrlCommand*)command;
+- (void)disableRedirect:(CDVInvokedUrlCommand*)command;
 - (void)post:(CDVInvokedUrlCommand*)command;
 - (void)get:(CDVInvokedUrlCommand*)command;
 - (void)put:(CDVInvokedUrlCommand*)command;
+- (void)patch:(CDVInvokedUrlCommand*)command;
 - (void)delete:(CDVInvokedUrlCommand*)command;
 - (void)uploadFile:(CDVInvokedUrlCommand*)command;
 - (void)downloadFile:(CDVInvokedUrlCommand*)command;
@@ -6,25 +6,31 @@
@interface CordovaHttpPlugin()

 - (void)setRequestHeaders:(NSDictionary*)headers forManager:(AFHTTPSessionManager*)manager;
- (void)setResults:(NSMutableDictionary*)dictionary withTask:(NSURLSessionTask*)task;
+- (void)handleSuccess:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response andData:(id)data;
+- (void)handleError:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response error:(NSError*)error;
+- (NSNumber*)getStatusCode:(NSError*) error;
+- (NSMutableDictionary*)copyHeaderFields:(NSDictionary*)headerFields;
+- (void)setTimeout:(NSTimeInterval)timeout forManager:(AFHTTPSessionManager*)manager;
+- (void)setRedirect:(AFHTTPSessionManager*)manager;

@end

-
@implementation CordovaHttpPlugin {
    AFSecurityPolicy *securityPolicy;
+    bool redirect;
 }

 - (void)pluginInitialize {
    securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeNone];
+    redirect = true;
 }

 - (void)setRequestSerializer:(NSString*)serializerName forManager:(AFHTTPSessionManager*)manager {
-  if ([serializerName isEqualToString:@"json"]) {
-    manager.requestSerializer = [AFJSONRequestSerializer serializer];
-  } else {
-    manager.requestSerializer = [AFHTTPRequestSerializer serializer];
-  }
+    if ([serializerName isEqualToString:@"json"]) {
+        manager.requestSerializer = [AFJSONRequestSerializer serializer];
+    } else {
+        manager.requestSerializer = [AFHTTPRequestSerializer serializer];
+    }
 }

 - (void)setRequestHeaders:(NSDictionary*)headers forManager:(AFHTTPSessionManager*)manager {
@@ -33,16 +39,76 @@
    }];
 }

- (void)setResults:(NSMutableDictionary*)dictionary withTask:(NSURLSessionTask*)task {
-    if (task.response != nil) {
-        NSHTTPURLResponse *response = (NSHTTPURLResponse *)task.response;
+- (void)setRedirect:(AFHTTPSessionManager*)manager {
+    [manager setTaskWillPerformHTTPRedirectionBlock:^NSURLRequest * _Nonnull(NSURLSession * _Nonnull session, NSURLSessionTask * _Nonnull task, NSURLResponse * _Nonnull response, NSURLRequest * _Nonnull request) {
+        if (redirect) {
+            return request;
+        } else {
+            return nil;
+        }
+    }];
+}
+
+- (void)handleSuccess:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response andData:(id)data {
+    if (response != nil) {
        [dictionary setObject:[NSNumber numberWithInt:response.statusCode] forKey:@"status"];
-        [dictionary setObject:response.allHeaderFields forKey:@"headers"];
+        [dictionary setObject:[self copyHeaderFields:response.allHeaderFields] forKey:@"headers"];
    }
+
+    if (data != nil) {
+        [dictionary setObject:data forKey:@"data"];
+    }
+}
+
+- (void)handleError:(NSMutableDictionary*)dictionary withResponse:(NSHTTPURLResponse*)response error:(NSError*)error {
+    if (response != nil) {
+        [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"];
+    } else {
+        [dictionary setObject:[self getStatusCode:error] forKey:@"status"];
+        [dictionary setObject:[error localizedDescription] forKey:@"error"];
+    }
+}
+
+- (NSNumber*)getStatusCode:(NSError*) error {
+    switch ([error code]) {
+        case -1001:
+            // timeout
+            return [NSNumber numberWithInt:1];
+        case -1002:
+            // unsupported URL
+            return [NSNumber numberWithInt:2];
+        case -1003:
+            // server not found
+            return [NSNumber numberWithInt:0];
+        case -1009:
+            // no connection
+            return [NSNumber numberWithInt:3];
+        default:
+            return [NSNumber numberWithInt:-1];
+    }
+}
+
+- (NSMutableDictionary*)copyHeaderFields:(NSDictionary *)headerFields {
+    NSMutableDictionary *headerFieldsCopy = [[NSMutableDictionary alloc] initWithCapacity:headerFields.count];
+    NSString *headerKeyCopy;
+
+    for (NSString *headerKey in headerFields.allKeys) {
+        headerKeyCopy = [[headerKey mutableCopy] lowercaseString];
+        [headerFieldsCopy setValue:[headerFields objectForKey:headerKey] forKey:headerKeyCopy];
+    }
+
+    return headerFieldsCopy;
+}
+
+- (void)setTimeout:(NSTimeInterval)timeout forManager:(AFHTTPSessionManager*)manager {
+    [manager.requestSerializer setTimeoutInterval:timeout];
 }

 - (void)enableSSLPinning:(CDVInvokedUrlCommand*)command {
    bool enable = [[command.arguments objectAtIndex:0] boolValue];
+
    if (enable) {
        securityPolicy = [AFSecurityPolicy policyWithPinningMode:AFSSLPinningModeCertificate];
    } else {
@@ -53,21 +119,22 @@
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }

- (void)acceptAllCerts:(CDVInvokedUrlCommand*)command {
+- (void)disableRedirect:(CDVInvokedUrlCommand*)command {
    CDVPluginResult* pluginResult = nil;
-    bool allow = [[command.arguments objectAtIndex:0] boolValue];
+    bool disable = [[command.arguments objectAtIndex:0] boolValue];

-    securityPolicy.allowInvalidCertificates = allow;
+    redirect = !disable;

    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }

- (void)validateDomainName:(CDVInvokedUrlCommand*)command {
+- (void)acceptAllCerts:(CDVInvokedUrlCommand*)command {
    CDVPluginResult* pluginResult = nil;
-    bool validate = [[command.arguments objectAtIndex:0] boolValue];
+    bool allow = [[command.arguments objectAtIndex:0] boolValue];

-    securityPolicy.validatesDomainName = validate;
+    securityPolicy.allowInvalidCertificates = allow;
+    securityPolicy.validatesDomainName = !allow;

    pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
@@ -76,26 +143,30 @@
 - (void)post:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
+
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSString *serializerName = [command.arguments objectAtIndex:2];
    NSDictionary *headers = [command.arguments objectAtIndex:3];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
+
    [self setRequestSerializer: serializerName forManager: manager];
    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [self setRedirect: manager];

    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 setResults: dictionary withTask: task];
-        [dictionary setObject:responseObject forKey:@"data"];
+        [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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -104,26 +175,31 @@
 - (void)get:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
+
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:3] doubleValue];
+
+
    [self setRequestSerializer: @"default" forManager: manager];
    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [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 setResults: dictionary withTask: task];
-        [dictionary setObject:responseObject forKey:@"data"];
+        [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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -132,26 +208,62 @@
 - (void)put:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
+
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSString *serializerName = [command.arguments objectAtIndex:2];
    NSDictionary *headers = [command.arguments objectAtIndex:3];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
+
    [self setRequestSerializer: serializerName forManager: manager];
    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [self setRedirect: manager];

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
    [manager PUT:url parameters:parameters success:^(NSURLSessionTask *task, id responseObject) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self setResults: dictionary withTask: task];
-        [dictionary setObject:responseObject forKey:@"data"];
+        [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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
+        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
+        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
+    }];
+}
+
+- (void)patch:(CDVInvokedUrlCommand*)command {
+    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
+    manager.securityPolicy = securityPolicy;
+
+    NSString *url = [command.arguments objectAtIndex:0];
+    NSDictionary *parameters = [command.arguments objectAtIndex:1];
+    NSString *serializerName = [command.arguments objectAtIndex:2];
+    NSDictionary *headers = [command.arguments objectAtIndex:3];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];
+
+    [self setRequestSerializer: serializerName forManager: manager];
+    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [self setRedirect: manager];
+
+    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];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -160,26 +272,30 @@
 - (void)delete:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
+
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:3] doubleValue];
+
    [self setRequestSerializer: @"default" forManager: manager];
    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [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 setResults: dictionary withTask: task];
-        [dictionary setObject:responseObject forKey:@"data"];
+        [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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -191,22 +307,26 @@
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:3] doubleValue];
+
    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [self setRedirect: manager];

    CordovaHttpPlugin* __weak weakSelf = self;

    manager.responseSerializer = [AFHTTPResponseSerializer serializer];
    [manager HEAD:url parameters:parameters success:^(NSURLSessionTask *task) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self setResults: dictionary withTask: task];
        // 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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -215,15 +335,19 @@
 - (void)uploadFile:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
+
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
    NSString *filePath = [command.arguments objectAtIndex: 3];
    NSString *name = [command.arguments objectAtIndex: 4];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:5] doubleValue];

    NSURL *fileURL = [NSURL URLWithString: filePath];

    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [self setRedirect: manager];

    CordovaHttpPlugin* __weak weakSelf = self;
    manager.responseSerializer = [TextResponseSerializer serializer];
@@ -240,14 +364,14 @@
        }
    } progress:nil success:^(NSURLSessionTask *task, id responseObject) {
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self setResults: dictionary withTask: task];
+        [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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -257,12 +381,16 @@
 - (void)downloadFile:(CDVInvokedUrlCommand*)command {
    AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
    manager.securityPolicy = securityPolicy;
+
    NSString *url = [command.arguments objectAtIndex:0];
    NSDictionary *parameters = [command.arguments objectAtIndex:1];
    NSDictionary *headers = [command.arguments objectAtIndex:2];
    NSString *filePath = [command.arguments objectAtIndex: 3];
+    NSTimeInterval timeoutInSeconds = [[command.arguments objectAtIndex:4] doubleValue];

    [self setRequestHeaders: headers forManager: manager];
+    [self setTimeout:timeoutInSeconds forManager:manager];
+    [self setRedirect: manager];

    if ([filePath hasPrefix:@"file://"]) {
        filePath = [filePath substringFromIndex:7];
@@ -292,7 +420,7 @@
         *
         * Modified by Andrew Stephan for Sync OnSet
         *
-        */
+         */
        // Download response is okay; begin streaming output to file
        NSString* parentPath = [filePath stringByDeletingLastPathComponent];

@@ -322,15 +450,15 @@

        id filePlugin = [self.commandDelegate getCommandInstance:@"File"];
        NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
-        [self setResults: dictionary withTask: task];
+        [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 setResults: dictionary withTask: task];
-        NSString* errResponse = [[NSString alloc] initWithData:(NSData *)error.userInfo[AFNetworkingOperationFailingURLResponseDataErrorKey] encoding:NSUTF8StringEncoding];
-        [dictionary setObject:errResponse forKey:@"error"];
+        [self handleError:dictionary withResponse:(NSHTTPURLResponse*)task.response error:error];
+
        CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsDictionary:dictionary];
        [weakSelf.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
    }];
@@ -23,7 +23,7 @@ static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger co
        return nil;
    }

-    self.acceptableContentTypes = [NSSet setWithObjects:@"text/plain", @"text/html", @"text/json", @"application/json", @"text/xml", @"application/xml", @"text/css", nil];
+    self.acceptableContentTypes = [NSSet setWithObjects:@"text/plain", @"text/html", @"text/json", @"application/hal+json", @"application/json", @"text/xml", @"application/xml", @"text/css", nil];

    return self;
 }
@@ -55,4 +55,4 @@ static BOOL AFErrorOrUnderlyingErrorHasCodeInDomain(NSError *error, NSInteger co
    return responseString;
 }

-@end
+@end
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='utf-8'?>
+<widget id="com.ilkimen.http.demo" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>HttpDemo</name>
+    <description>
+        A sample Apache Cordova application that demonstrates advanced HTTP plugin.
+    </description>
+    <author email="dev@cordova.apache.org" href="http://cordova.io">
+        Sefa Ilkimen
+    </author>
+    <content src="index.html" />
+    <access origin="*" />
+    <allow-intent href="http://*/*" />
+    <allow-intent href="https://*/*" />
+    <allow-intent href="tel:*" />
+    <allow-intent href="sms:*" />
+    <allow-intent href="mailto:*" />
+    <allow-intent href="geo:*" />
+    <platform name="android">
+        <allow-intent href="market:*" />
+    </platform>
+    <platform name="ios">
+        <allow-intent href="itms:*" />
+        <allow-intent href="itms-apps:*" />
+    </platform>
+    <engine name="android" spec="6.2.3" />
+    <engine name="ios" spec="4.4.0" />
+</widget>
@@ -0,0 +1,25 @@
+{
+    "name": "com.ilkimen.http.demo",
+    "displayName": "HttpDemo",
+    "version": "1.0.0",
+    "description": "A sample Apache Cordova application that demonstrates advanced HTTP plugin.",
+    "main": "index.js",
+    "scripts": {
+        "build": "scripts/build.sh",
+        "test": "npm run build && scripts/test.sh"
+    },
+    "author": "Sefa Ilkimen",
+    "license": "Apache-2.0",
+    "dependencies": {
+        "cordova": "7.0.1",
+        "cordova-android": "6.2.3",
+        "cordova-ios": "4.4.0"
+    },
+    "cordova": {
+        "platforms": [
+            "android",
+            "ios"
+        ]
+    },
+    "devDependencies": {}
+}
@@ -0,0 +1,24 @@
+* {
+    -webkit-tap-highlight-color: rgba(0,0,0,0); /* make transparent link selection, adjust last value opacity 0 to 1.0 */
+}
+
+body {
+    -webkit-touch-callout: none;                /* prevent callout to copy image, etc when tap to hold */
+    -webkit-text-size-adjust: none;             /* prevent webkit from resizing text to fit */
+    -webkit-user-select: none;                  /* prevent copy paste, to allow, change 'none' to 'text' */
+    height:100%;
+    margin:0px;
+    padding:20px 0;
+    width:100%;
+    font-family: sans-serif;
+}
+
+button, input, textarea {
+  display: block;
+  width: 100%;
+}
+
+h1 {
+  font-size: 12pt;
+  text-align: center;
+}
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;">
+        <meta name="format-detection" content="telephone=no">
+        <meta name="msapplication-tap-highlight" content="no">
+        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
+        <link rel="stylesheet" type="text/css" href="css/index.css">
+    </head>
+    <body>
+        <h1 id="descriptionLbl">Advanced HTTP test suite</h1>
+        <textarea rows="16" cols="50" id="expectedTextarea">Click next to run first test.</textarea>
+        <textarea rows="16" cols="50" id="resultTextarea"></textarea>
+        <button id="nextBtn">Run next test</button>
+
+        <script type="text/javascript" src="cordova.js"></script>
+        <script type="text/javascript" src="js/test-definitions.js"></script>
+        <script type="text/javascript" src="js/index.js"></script>
+    </body>
+</html>
@@ -0,0 +1,71 @@
+const app = {
+  testIndex: -1,
+
+  initialize: function() {
+    document.getElementById('nextBtn').addEventListener('click', app.onNextBtnClick);
+  },
+
+  printResult: function(prefix, content) {
+    const text = prefix + ': ' + JSON.stringify(content);
+
+    document.getElementById('resultTextarea').value += text;
+  },
+
+  reject: function(content) {
+    app.printResult('result - rejected', content);
+  },
+
+  resolve: function(content) {
+    app.printResult('result - resolved', content);
+  },
+
+  runTest: function(index) {
+    const testDefinition = tests[index];
+    const titleText = app.testIndex + ': ' + testDefinition.description;
+    const expectedText = 'expected - ' + testDefinition.expected;
+
+    document.getElementById('expectedTextarea').value = expectedText;
+    document.getElementById('resultTextarea').value = '';
+    document.getElementById('descriptionLbl').innerText = titleText;
+    testDefinition.func(app.resolve, app.reject);
+  },
+
+  onBeforeTest: function(testIndex, cb) {
+    if (hooks && hooks.onBeforeEachTest) {
+      return hooks.onBeforeEachTest(function() {
+        const testDefinition = tests[testIndex];
+
+        if (testDefinition.before) {
+          testDefinition.before(cb);
+        } else {
+          cb();
+        }
+      });
+    } else {
+      cb();
+    }
+  },
+
+  onFinishedAllTests: function() {
+    const titleText = 'No more tests';
+    const expectedText = 'You have run all available tests.';
+
+    document.getElementById('expectedTextarea').value = expectedText;
+    document.getElementById('resultTextarea').value = '';
+    document.getElementById('descriptionLbl').innerText = titleText;
+  },
+
+  onNextBtnClick: function() {
+    app.testIndex += 1;
+
+    if (app.testIndex < tests.length) {
+      app.onBeforeTest(app.testIndex, function() {
+        app.runTest(app.testIndex);
+      });
+    } else {
+      app.onFinishedAllTests();
+    }
+  }
+};
+
+app.initialize();
@@ -0,0 +1,10 @@
+const path = require('path');
+
+if (process.env.SAUCE_USERNAME) {
+  exports.iosTestApp = 'sauce-storage:HttpDemo.app.zip';
+  exports.androidTestApp = 'sauce-storage:HttpDemo.apk';
+} else {
+  // these paths are relative to working directory
+  exports.iosTestApp = path.resolve('temp/platforms/ios/build/emulator/HttpDemo.app');
+  exports.androidTestApp = path.resolve('temp/platforms/android/build/outputs/apk/android-debug.apk');
+}
@@ -0,0 +1,65 @@
+const local = {
+  iosDevice: {
+    browserName: '',
+    'appium-version': '1.7.1',
+    platformName: 'iOS',
+    platformVersion: '10.3',
+    deviceName: 'iPhone 6',
+    autoWebview: true,
+    app: undefined // will be set later
+  },
+  iosEmulator: {
+    browserName: '',
+    'appium-version': '1.7.1',
+    platformName: 'iOS',
+    platformVersion: '11.0',
+    deviceName: 'iPhone Simulator',
+    autoWebview: true,
+    app: undefined // will be set later
+  },
+  androidEmulator: {
+    browserName: '',
+    'appium-version': '1.7.1',
+    platformName: 'Android',
+    platformVersion: '5.1',
+    deviceName: 'Android Emulator',
+    autoWebview: true,
+    app: undefined // will be set later
+  }
+};
+
+const sauce = {
+  iosDevice: {
+    browserName: '',
+    'appium-version': '1.7.1',
+    platformName: 'iOS',
+    platformVersion: '10.3',
+    deviceName: 'iPhone 6',
+    autoWebview: true,
+    app: undefined // will be set later
+  },
+  iosEmulator: {
+    browserName: '',
+    'appium-version': '1.7.1',
+    platformName: 'iOS',
+    platformVersion: '10.3',
+    deviceName: 'iPhone Simulator',
+    autoWebview: true,
+    app: undefined // will be set later
+  },
+  androidEmulator: {
+    browserName: '',
+    'appium-version': '1.7.1',
+    platformName: 'Android',
+    platformVersion: '5.1',
+    deviceName: 'Android Emulator',
+    autoWebview: true,
+    app: undefined // will be set later
+  }
+};
+
+if (process.env.SAUCE_USERNAME) {
+  module.exports = sauce;
+} else {
+  module.exports = local;
+}
@@ -0,0 +1,13 @@
+exports.configure = driver => {
+  driver.on('status', info => {
+    console.log(info.cyan);
+  });
+
+  driver.on('command', (meth, path, data) => {
+    console.log(' > ' + meth.yellow, path.grey, data || '');
+  });
+
+  driver.on('http', (meth, path, data) => {
+    console.log(' > ' + meth.magenta, path, (data || '').grey);
+  });
+};
@@ -0,0 +1,16 @@
+const local = {
+  host: 'localhost',
+  port: 4723
+};
+
+const sauce = {
+  host: 'ondemand.saucelabs.com',
+  port: 80,
+  auth: process.env.SAUCE_USERNAME + ":" + process.env.SAUCE_ACCESS_KEY
+};
+
+if (process.env.SAUCE_USERNAME) {
+  module.exports = sauce;
+} else {
+  module.exports = local;
+}
@@ -0,0 +1,12 @@
+const wd = require("wd");
+
+require('colors');
+
+const chai = require('chai');
+const chaiAsPromised = require('chai-as-promised');
+chai.use(chaiAsPromised);
+
+const should = chai.should();
+chaiAsPromised.transferPromiseness = wd.transferPromiseness;
+
+exports.should = should;
@@ -0,0 +1,73 @@
+require('./helpers/setup');
+
+const wd = require('wd');
+const apps = require('./helpers/apps');
+const caps = Object.assign({}, require('./helpers/caps'));
+const serverConfig = require('./helpers/server');
+const testDefinitions = require('../test-definitions');
+const pkgjson = require('../../package.json');
+
+describe('Advanced HTTP', function() {
+  let driver;
+  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];
+
+    desiredCaps.name = pkgjson.name;
+    desiredCaps.app = desiredApp;
+
+    return desiredCaps;
+  };
+
+  const validateTestIndex = number => driver
+    .elementById('descriptionLbl')
+    .text()
+    .then(text => parseInt(text.match(/(\d+):/)[1], 10))
+    .should.eventually.become(number, 'Test index is not matching!');
+
+  const validateTestTitle = testTitle => driver
+    .elementById('descriptionLbl')
+    .text()
+    .then(text => text.match(/\d+:\ (.*)/)[1])
+    .should.eventually.become(testTitle, 'Test description is not matching!');
+
+  const validateResult = text => driver
+    .elementById('resultTextarea')
+    .getAttribute('value')
+    .should.eventually.include(text);
+
+  const clickNext = () => driver
+    .elementById('nextBtn')
+    .click()
+    .sleep(1000);
+
+  before(() => {
+    driver = wd.promiseChainRemote(serverConfig);
+    require('./helpers/logging').configure(driver);
+
+    return driver.init(getCaps('TestApp'));
+  });
+
+  after(() => driver
+    .quit()
+    .finally(function () {
+      if (process.env.SAUCE_USERNAME) {
+        return driver.sauceJobStatus(allPassed);
+      }
+    }));
+
+  testDefinitions.tests.forEach((definition, index) => {
+    it(definition.description, function() {
+      return clickNext()
+        .then(() => validateTestIndex(index))
+        .then(() => validateTestTitle(this.test.title))
+        .then(() => validateResult(definition.expected))
+      });
+  });
+});
@@ -0,0 +1,67 @@
+const hooks = {
+  onBeforeEachTest: function(done) {
+    cordova.plugin.http.acceptAllCerts(false, done, done);
+  }
+};
+
+const helpers = {
+  acceptAllCerts: function(done) { cordova.plugin.http.acceptAllCerts(true, done, done); }
+};
+
+const tests = [
+  {
+    description: 'should reject self signed cert (GET)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
+  },{
+    description: 'should reject self signed cert (PUT)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
+  },{
+    description: 'should reject self signed cert (POST)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
+  },{
+    description: 'should reject self signed cert (PATCH)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
+  },{
+    description: 'should reject self signed cert (DELETE)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
+  },{
+    description: 'should accept bad cert (GET)',
+    expected: 'resolved: {\"status\":200,',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
+  },{
+    description: 'should accept bad cert (PUT)',
+    expected: 'rejected: {\"status\":405,', // will be rejected because PUT is not allowed
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
+  },{
+    description: 'should accept bad cert (POST)',
+    expected: 'rejected: {\"status\":405,', // will be rejected because POST is not allowed
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
+  },{
+    description: 'should accept bad cert (PATCH)',
+    expected: 'rejected: {\"status\":405,', // will be rejected because PATCH is not allowed
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); }
+  },{
+    description: 'should accept bad cert (DELETE)',
+    expected: 'rejected: {\"status\":405,', // will be rejected because DELETE is not allowed
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); }
+  },{
+    description: 'should fetch data from http://google.com/ (GET)',
+    expected: 'resolved: {\"status\":200,',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.get('http://google.com/', {}, {}, resolve, reject); }
+  }
+];
+
+if (module && module.exports) {
+  module.exports = { tests: tests, hooks: hooks };
+}
@@ -0,0 +1,274 @@
+/*global angular*/
+
+/*
+ *
+ * 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
+ * Modified by Sefa Ilkimen:
+ *  - added configurable params serializer
+ *  - added put and delete methods
+ *  - using cordova www module pattern
+ *  - some minor improvements
+ *
+*/
+
+/*
+ * An HTTP Plugin for PhoneGap.
+ */
+
+var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var validSerializers = ['urlencoded', 'json'];
+
+var exec = require('cordova/exec');
+var angularIntegration = require(pluginId +'.angular-integration');
+var cookieHandler = require(pluginId + '.cookie-handler');
+
+// 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 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 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,
+    getBasicAuthHeader: function (username, password) {
+        return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
+    },
+    useBasicAuth: function (username, password) {
+        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
+    },
+    setHeader: function (header, value) {
+        this.headers[header] = value;
+    },
+    setDataSerializer: function (serializer) {
+        this.dataSerializer = checkSerializer(serializer);
+    },
+    clearCookies: function () {
+        return cookieHandler.clearCookies();
+    },
+    removeCookies: function (url, callback) {
+        cookieHandler.removeCookies(url, callback);
+    },
+    setRequestTimeout: function(timeout) {
+        this.timeoutInSeconds = timeout;
+    },
+    enableSSLPinning: function (enable, success, failure) {
+        return exec(success, failure, 'CordovaHttpPlugin', 'enableSSLPinning', [enable]);
+    },
+    acceptAllCerts: function (allow, success, failure) {
+        return exec(success, failure, 'CordovaHttpPlugin', 'acceptAllCerts', [allow]);
+    },
+    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');
+    },
+    post: function (url, data, headers, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        data = data || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'post', [url, data, this.dataSerializer, headers, this.timeoutInSeconds]);
+    },
+    get: function (url, params, headers, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'get', [url, params, headers, this.timeoutInSeconds]);
+    },
+    put: function (url, data, headers, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        data = data || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'put', [url, data, this.dataSerializer, headers, this.timeoutInSeconds]);
+    },
+
+    patch: function (url, data, headers, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        data = data || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'patch', [url, data, this.dataSerializer, headers, this.timeoutInSeconds]);
+    },
+
+    delete: function (url, params, headers, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'delete', [url, params, headers, this.timeoutInSeconds]);
+    },
+    head: function (url, params, headers, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'head', [url, params, headers, this.timeoutInSeconds]);
+    },
+    uploadFile: function (url, params, headers, filePath, name, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, success);
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'uploadFile', [url, params, headers, filePath, name, this.timeoutInSeconds]);
+    },
+    downloadFile: function (url, params, headers, filePath, success, failure) {
+        handleMissingCallbacks(success, failure);
+
+        params = params || {};
+        headers = headers || {};
+        headers = mergeHeaders(this.headers, headers);
+        headers = mergeHeaders(getCookieHeader(url), headers);
+
+        var onSuccess = injectCookieHandler(url, injectFileEntryHandler(success));
+        var onFail = injectCookieHandler(url, failure);
+
+        return exec(onSuccess, onFail, 'CordovaHttpPlugin', 'downloadFile', [url, params, headers, filePath, this.timeoutInSeconds]);
+    }
+};
+
+angularIntegration.registerService(http);
+module.exports = http;
@@ -0,0 +1,96 @@
+function registerService(http) {
+    if (typeof angular === 'undefined') return;
+
+    angular.module('cordovaHTTP', []).factory('cordovaHTTP', function ($timeout, $q) {
+        function makePromise(fn, args, async) {
+            var deferred = $q.defer();
+
+            var success = function (response) {
+                if (async) {
+                    $timeout(function () {
+                        deferred.resolve(response);
+                    });
+                } else {
+                    deferred.resolve(response);
+                }
+            };
+
+            var fail = function (response) {
+                if (async) {
+                    $timeout(function () {
+                        deferred.reject(response);
+                    });
+                } else {
+                    deferred.reject(response);
+                }
+            };
+
+            args.push(success);
+            args.push(fail);
+
+            fn.apply(http, args);
+
+            return deferred.promise;
+        }
+
+        var cordovaHTTP = {
+            getBasicAuthHeader: http.getBasicAuthHeader,
+            useBasicAuth: function (username, password) {
+                return http.useBasicAuth(username, password);
+            },
+            setHeader: function (header, value) {
+                return http.setHeader(header, value);
+            },
+            setDataSerializer: function (serializer) {
+                return http.setDataSerializer(serializer);
+            },
+            clearCookies: function () {
+                return http.clearCookies();
+            },
+            removeCookies: function (url) {
+                return http.removeCookies(url);
+            },
+            setRequestTimeout: function (timeout) {
+                return http.setRequestTimeout(timeout);
+            },
+            enableSSLPinning: function (enable) {
+                return makePromise(http.enableSSLPinning, [enable]);
+            },
+            acceptAllCerts: function (allow) {
+                return makePromise(http.acceptAllCerts, [allow]);
+            },
+            disableRedirect: function(disable) {
+                return makePromise(http.disableRedirect, [disable]);
+            },
+            validateDomainName: function (validate) {
+                return makePromise(http.validateDomainName, [validate]);
+            },
+            post: function (url, data, headers) {
+                return makePromise(http.post, [url, data, headers], true);
+            },
+            get: function (url, params, headers) {
+                return makePromise(http.get, [url, params, headers], true);
+            },
+            put: function (url, data, headers) {
+                return makePromise(http.put, [url, data, headers], true);
+            },
+            delete: function (url, params, headers) {
+                return makePromise(http.delete, [url, params, headers], true);
+            },
+            head: function (url, params, headers) {
+                return makePromise(http.head, [url, params, headers], true);
+            },
+            uploadFile: function (url, params, headers, filePath, name) {
+                return makePromise(http.uploadFile, [url, params, headers, filePath, name], true);
+            },
+            downloadFile: function (url, params, headers, filePath) {
+                return makePromise(http.downloadFile, [url, params, headers, filePath], true);
+            }
+        };
+        return cordovaHTTP;
+    });
+}
+
+module.exports = {
+    registerService: registerService
+};
@@ -0,0 +1,66 @@
+var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var ToughCookie = require(pluginId + '.tough-cookie');
+var WebStorageCookieStore = require(pluginId + '.local-storage-store');
+
+var storage = window.localStorage;
+var storeKey = '__advancedHttpCookieStore__';
+
+var store = new WebStorageCookieStore(storage, storeKey);
+var cookieJar = new ToughCookie.CookieJar(store);
+
+module.exports = {
+    setCookieFromString: setCookieFromString,
+    getCookieString: getCookieString,
+    clearCookies: clearCookies,
+    removeCookies: removeCookies
+}
+
+function splitCookieString(cookieStr) {
+    var cookieParts = cookieStr.split(',');
+    var splitCookies = [];
+    var processedCookie = null;
+
+    for (var i = 0; i < cookieParts.length; ++i) {
+        if (cookieParts[i].substr(-11, 8).toLowerCase() === 'expires=') {
+            processedCookie = cookieParts[i] + ',' + cookieParts[i + 1];
+            i++;
+        } else {
+            processedCookie = cookieParts[i];
+        }
+
+        processedCookie = processedCookie.trim();
+        splitCookies.push(processedCookie);
+    }
+
+    return splitCookies;
+}
+
+function setCookieFromString(url, cookieStr) {
+    if (!cookieStr) return;
+
+    var cookies = splitCookieString(cookieStr);
+
+    for (var i = 0; i < cookies.length; ++i) {
+        cookieJar.setCookieSync(cookies[i], url, { ignoreError: true });
+    }
+}
+
+function getCookieString(url) {
+    return cookieJar.getCookieStringSync(url);
+}
+
+function clearCookies() {
+    window.localStorage.removeItem(storeKey);
+}
+
+function removeCookies(url, cb) {
+    cookieJar.getCookies(url, function(error, cookies) {
+        if (!cookies || cookies.length === 0) {
+        return cb(null, []);
+        }
+
+        var domain = cookies[0].domain;
+
+        cookieJar.store.removeCookies(domain, null, cb);
+    });
+}
@@ -1,217 +0,0 @@
-/*global angular*/
-
-/*
- *
- * 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
- * Modified by Sefa Ilkimen:
- *  - added configurable params serializer
- *
-*/
-
-/*
- * An HTTP Plugin for PhoneGap.
- */
-
-var exec = require('cordova/exec');
-var validSerializers = ['urlencoded', 'json'];
-
-// 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 checkSerializer(serializer) {
-  serializer = serializer || '';
-  serializer = serializer.trim().toLowerCase();
-
-  if (validSerializers.indexOf(serializer) > -1) {
-    return serializer;
-  }
-
-  return serializer[0];
-}
-
-var http = {
-    headers: {},
-    dataSerializer: 'urlencoded',
-    sslPinning: false,
-    getBasicAuthHeader: function (username, password) {
-        return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
-    },
-    useBasicAuth: function (username, password) {
-        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
-    },
-    setHeader: function (header, value) {
-        this.headers[header] = value;
-    },
-    setDataSerializer: function (serializer) {
-      this.dataSerializer = checkSerializer(serializer);
-    },
-    enableSSLPinning: function (enable, success, failure) {
-        return exec(success, failure, 'CordovaHttpPlugin', 'enableSSLPinning', [enable]);
-    },
-    acceptAllCerts: function (allow, success, failure) {
-        return exec(success, failure, 'CordovaHttpPlugin', 'acceptAllCerts', [allow]);
-    },
-    validateDomainName: function (validate, success, failure) {
-        return exec(success, failure, 'CordovaHttpPlugin', 'validateDomainName', [validate]);
-    },
-    post: function (url, data, headers, success, failure) {
-        data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, 'CordovaHttpPlugin', 'post', [url, data, this.dataSerializer, headers]);
-    },
-    get: function (url, params, headers, success, failure) {
-        params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, 'CordovaHttpPlugin', 'get', [url, params, headers]);
-    },
-    put: function (url, data, headers, success, failure) {
-        data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, 'CordovaHttpPlugin', 'put', [url, data, this.dataSerializer, headers]);
-    },
-    delete: function (url, params, headers, success, failure) {
-        params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, 'CordovaHttpPlugin', 'delete', [url, params, headers]);
-    },
-    head: function (url, params, headers, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, 'CordovaHttpPlugin', 'head', [url, params, headers]);
-    },
-    uploadFile: function (url, params, headers, filePath, name, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        return exec(success, failure, 'CordovaHttpPlugin', 'uploadFile', [url, params, headers, filePath, name]);
-    },
-    downloadFile: function (url, params, headers, filePath, success, failure) {
-        headers = mergeHeaders(this.headers, headers);
-        var win = function (result) {
-            var entry = new (require('cordova-plugin-file.FileEntry'))();
-            entry.isDirectory = false;
-            entry.isFile = true;
-            entry.name = result.file.name;
-            entry.fullPath = result.file.fullPath;
-            entry.filesystem = new FileSystem(result.file.filesystemName || (result.file.filesystem == window.PERSISTENT ? 'persistent' : 'temporary'));
-            entry.nativeURL = result.file.nativeURL;
-            success(entry);
-        };
-        return exec(win, failure, 'CordovaHttpPlugin', 'downloadFile', [url, params, headers, filePath]);
-    }
-};
-
-if (typeof angular !== 'undefined') {
-    angular.module('cordovaHTTP', []).factory('cordovaHTTP', function ($timeout, $q) {
-        function makePromise(fn, args, async) {
-            var deferred = $q.defer();
-
-            var success = function (response) {
-                if (async) {
-                    $timeout(function () {
-                        deferred.resolve(response);
-                    });
-                } else {
-                    deferred.resolve(response);
-                }
-            };
-
-            var fail = function (response) {
-                if (async) {
-                    $timeout(function () {
-                        deferred.reject(response);
-                    });
-                } else {
-                    deferred.reject(response);
-                }
-            };
-
-            args.push(success);
-            args.push(fail);
-
-            fn.apply(http, args);
-
-            return deferred.promise;
-        }
-
-        var cordovaHTTP = {
-            getBasicAuthHeader: http.getBasicAuthHeader,
-            useBasicAuth: function (username, password) {
-                return http.useBasicAuth(username, password);
-            },
-            setHeader: function (header, value) {
-                return http.setHeader(header, value);
-            },
-            setDataSerializer: function (serializer) {
-                return http.setParamSerializer(serializer);
-            },
-            enableSSLPinning: function (enable) {
-                return makePromise(http.enableSSLPinning, [enable]);
-            },
-            acceptAllCerts: function (allow) {
-                return makePromise(http.acceptAllCerts, [allow]);
-            },
-            validateDomainName: function (validate) {
-                return makePromise(http.validateDomainName, [validate]);
-            },
-            post: function (url, data, headers) {
-                return makePromise(http.post, [url, data, headers], true);
-            },
-            get: function (url, params, headers) {
-                return makePromise(http.get, [url, params, headers], true);
-            },
-            put: function (url, data, headers) {
-                return makePromise(http.put, [url, data, headers], true);
-            },
-            delete: function (url, params, headers) {
-                return makePromise(http.delete, [url, params, headers], true);
-            },
-            head: function (url, params, headers) {
-                return makePromise(http.head, [url, params, headers], true);
-            },
-            uploadFile: function (url, params, headers, filePath, name) {
-                return makePromise(http.uploadFile, [url, params, headers, filePath, name], true);
-            },
-            downloadFile: function (url, params, headers, filePath) {
-                return makePromise(http.downloadFile, [url, params, headers, filePath], true);
-            }
-        };
-        return cordovaHTTP;
-    });
-}
-
-module.exports = http;
@@ -0,0 +1,183 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Exponent
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ * Based on "tough-cookie-web-storage-store" v1.0.0
+ * Thanks James Ide: https://github.com/exponentjs/tough-cookie-web-storage-store
+ *
+ * Modified by Sefa Ilkimen for cordova plugin integration
+ *
+ */
+
+'use strict';
+
+var pluginId = module.id.slice(0, module.id.indexOf('.'));
+var ToughCookie = require(pluginId + '.tough-cookie');
+var _ = require(pluginId + '.lodash');
+
+function WebStorageCookieStore(storage, storeKey) {
+    ToughCookie.Store.call(this);
+    this._storage = storage || window.localStorage;
+    this._storeKey = storeKey || '__cookieStore__';
+    this.synchronous = true;
+}
+
+WebStorageCookieStore.prototype = Object.create(ToughCookie.Store);
+
+WebStorageCookieStore.prototype.findCookie = function(domain, path, key, callback) {
+    var store = this._readStore();
+    var cookie = _.get(store, [domain, path, key], null);
+
+    callback(null, ToughCookie.Cookie.fromJSON(cookie));
+};
+
+WebStorageCookieStore.prototype.findCookies = function(domain, path, callback) {
+    if (!domain) {
+        callback(null, []);
+        return;
+    }
+
+    var that = this;
+    var cookies = [];
+    var store = this._readStore();
+    var domains = ToughCookie.permuteDomain(domain) || [domain];
+
+    domains.forEach(function(domain) {
+        if (!store[domain]) {
+            return;
+        }
+
+        var matchingPaths = Object.keys(store[domain]);
+
+        if (path != null) {
+            matchingPaths = matchingPaths.filter(function(cookiePath) {
+                return that._isOnPath(cookiePath, path);
+            });
+        }
+
+        matchingPaths.forEach(function(path) {
+            Array.prototype.push.apply(cookies, _.values(store[domain][path]));
+        });
+    });
+
+    cookies = cookies.map(function(cookie) {
+        return ToughCookie.Cookie.fromJSON(cookie);
+    });
+
+    callback(null, cookies);
+};
+
+/**
+ * Returns whether `cookiePath` is on the given `urlPath`
+ */
+WebStorageCookieStore.prototype._isOnPath = function(cookiePath, urlPath) {
+    if (!cookiePath) {
+        return false;
+    }
+
+    if (cookiePath === urlPath) {
+        return true;
+    }
+
+    if (urlPath.indexOf(cookiePath) !== 0) {
+        return false;
+    }
+
+    if (cookiePath[cookiePath.length - 1] !== '/' && urlPath[cookiePath.length] !== '/') {
+        return false;
+    }
+
+    return true;
+};
+
+WebStorageCookieStore.prototype.putCookie = function(cookie, callback) {
+     var store = this._readStore();
+
+     _.set(store, [cookie.domain, cookie.path, cookie.key], cookie);
+     this._writeStore(store);
+     callback(null);
+};
+
+WebStorageCookieStore.prototype.updateCookie = function(oldCookie, newCookie, callback) {
+    this.putCookie(newCookie, callback);
+};
+
+
+WebStorageCookieStore.prototype.removeCookie = function(domain, path, key, callback) {
+    var store = this._readStore();
+
+    _.unset(store, [domain, path, key]);
+    this._writeStore(store);
+    callback(null);
+};
+
+WebStorageCookieStore.prototype.removeCookies = function(domain, path, callback) {
+    var store = this._readStore();
+
+    if (path == null) {
+        _.unset(store, [domain]);
+    } else {
+        _.unset(store, [domain, path]);
+    }
+
+    this._writeStore(store);
+    callback(null);
+};
+
+WebStorageCookieStore.prototype.getAllCookies = function(callback) {
+    var cookies = [];
+    var store = this._readStore();
+
+    Object.keys(store).forEach(function(domain) {
+        Object.keys(store[domain]).forEach(function(path) {
+            Array.protype.push.apply(cookies, _.values(store[domain][path]));
+        });
+    });
+
+    cookies = cookies.map(function(cookie) {
+        return ToughCookie.Cookie.fromJSON(cookie);
+    });
+
+    cookies.sort(function(c1, c2) {
+        return (c1.creationIndex || 0) - (c2.creationIndex || 0);
+    });
+
+    callback(null, cookies);
+};
+
+WebStorageCookieStore.prototype._readStore = function() {
+    var json = this._storage.getItem(this._storeKey);
+
+    if (json !== null) {
+        try {
+            return JSON.parse(json);
+        } catch (e) { }
+    }
+
+    return {};
+};
+
+WebStorageCookieStore.prototype._writeStore = function(store) {
+    this._storage.setItem(this._storeKey, JSON.stringify(store));
+};
+
+module.exports = WebStorageCookieStore;
@@ -0,0 +1,20 @@
+/**
+ * @license
+ * Lodash (Custom Build) lodash.com/license | Underscore.js 1.8.3 underscorejs.org/LICENSE
+ * Build: `lodash include="get,set,unset,values" exports="node"`
+ */
+;(function(){function t(t,e){for(var r=-1,n=null==t?0:t.length,o=Array(n);++r<n;)o[r]=e(t[r],r,t);return o}function e(t){return function(e){return t(e)}}function r(e,r){return t(r,function(t){return e[t]})}function n(){}function o(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function u(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1])}}function i(t){var e=-1,r=null==t?0:t.length;for(this.clear();++e<r;){var n=t[e];this.set(n[0],n[1]);
+}}function c(t,e){for(var r=t.length;r--;)if(m(t[r][0],e))return r;return-1}function a(t,e){e=h(e,t);for(var r=0,n=e.length;null!=t&&r<n;)t=t[j(e[r++])];return r&&r==n?t:E}function l(t){if(null==t)return t===E?"[object Undefined]":"[object Null]";t=Object(t);var e;if(nt&&nt in t){var r=Q.call(t,nt),n=t[nt];try{t[nt]=E,e=true}catch(t){}var o=Y.call(t);e&&(r?t[nt]=n:delete t[nt]),e=o}else e=Y.call(t);return e}function s(t){return w(t)&&"[object Arguments]"==l(t)}function f(t){return w(t)&&z(t.length)&&!!M[l(t)];
+}function p(e){if(typeof e=="string")return e;if(ft(e))return t(e,p)+"";if(x(e))return at?at.call(e):"";var r=e+"";return"0"==r&&1/e==-T?"-0":r}function h(t,e){var r;return ft(t)?r=t:(ft(t)?r=false:(r=typeof t,r=!("number"!=r&&"symbol"!=r&&"boolean"!=r&&null!=t&&!x(t))||(B.test(t)||!I.test(t)||null!=e&&t in Object(e))),r=r?[t]:lt(F(t))),r}function y(t,e){var r=t.__data__,n=typeof e;return("string"==n||"number"==n||"symbol"==n||"boolean"==n?"__proto__"!==e:null===e)?r[typeof e=="string"?"string":"hash"]:r.map;
+}function b(t,e){var r=null==t?E:t[e];return(!S(r)||X&&X in r?0:(O(r)?Z:L).test(g(r)))?r:E}function _(t,e){return e=null==e?9007199254740991:e,!!e&&(typeof t=="number"||R.test(t))&&-1<t&&0==t%1&&t<e}function j(t){if(typeof t=="string"||x(t))return t;var e=t+"";return"0"==e&&1/t==-T?"-0":e}function g(t){if(null!=t){try{return K.call(t)}catch(t){}return t+""}return""}function v(t){var e=null==t?0:t.length;return e?t[e-1]:E}function d(t,e){function r(){var n=arguments,o=e?e.apply(this,n):n[0],u=r.cache;
+return u.has(o)?u.get(o):(n=t.apply(this,n),r.cache=u.set(o,n)||u,n)}if(typeof t!="function"||null!=e&&typeof e!="function")throw new TypeError("Expected a function");return r.cache=new(d.Cache||i),r}function m(t,e){return t===e||t!==t&&e!==e}function A(t){return null!=t&&z(t.length)&&!O(t)}function O(t){return!!S(t)&&(t=l(t),"[object Function]"==t||"[object GeneratorFunction]"==t||"[object AsyncFunction]"==t||"[object Proxy]"==t)}function z(t){return typeof t=="number"&&-1<t&&0==t%1&&9007199254740991>=t;
+}function S(t){var e=typeof t;return null!=t&&("object"==e||"function"==e)}function w(t){return null!=t&&typeof t=="object"}function x(t){return typeof t=="symbol"||w(t)&&"[object Symbol]"==l(t)}function F(t){return null==t?"":p(t)}function $(t){if(A(t)){var e=ft(t),r=!e&&st(t),n=!e&&!r&&pt(t),o=!e&&!r&&!n&&ht(t);if(e=e||r||n||o){for(var r=t.length,u=String,i=-1,c=Array(r);++i<r;)c[i]=u(i);r=c}else r=[];var a,u=r.length;for(a in t)!Q.call(t,a)||e&&("length"==a||n&&("offset"==a||"parent"==a)||o&&("buffer"==a||"byteLength"==a||"byteOffset"==a)||_(a,u))||r.push(a);
+t=r}else if(a=t&&t.constructor,t===(typeof a=="function"&&a.prototype||H)){a=[];for(n in Object(t))Q.call(t,n)&&"constructor"!=n&&a.push(n);t=a}else t=ut(t);return t}function k(){return false}var E,T=1/0,I=/\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/,B=/^\w*$/,P=/^\./,U=/[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=(?:\.|\[\])(?:\.|\[\]|$))/g,C=/\\(\\)?/g,L=/^\[object .+?Constructor\]$/,R=/^(?:0|[1-9]\d*)$/,M={};M["[object Float32Array]"]=M["[object Float64Array]"]=M["[object Int8Array]"]=M["[object Int16Array]"]=M["[object Int32Array]"]=M["[object Uint8Array]"]=M["[object Uint8ClampedArray]"]=M["[object Uint16Array]"]=M["[object Uint32Array]"]=true,
+M["[object Arguments]"]=M["[object Array]"]=M["[object ArrayBuffer]"]=M["[object Boolean]"]=M["[object DataView]"]=M["[object Date]"]=M["[object Error]"]=M["[object Function]"]=M["[object Map]"]=M["[object Number]"]=M["[object Object]"]=M["[object RegExp]"]=M["[object Set]"]=M["[object String]"]=M["[object WeakMap]"]=false;var N,D=typeof global=="object"&&global&&global.Object===Object&&global,V=typeof self=="object"&&self&&self.Object===Object&&self,q=D||V||Function("return this")(),G=(V=typeof exports=="object"&&exports&&!exports.nodeType&&exports)&&typeof module=="object"&&module&&!module.nodeType&&module,W=G&&G.exports===V,D=W&&D.process;
+t:{try{N=D&&D.binding&&D.binding("util");break t}catch(t){}N=void 0}N=N&&N.isTypedArray;var D=Array.prototype,H=Object.prototype,J=q["__core-js_shared__"],K=Function.prototype.toString,Q=H.hasOwnProperty,X=function(){var t=/[^.]+$/.exec(J&&J.keys&&J.keys.IE_PROTO||"");return t?"Symbol(src)_1."+t:""}(),Y=H.toString,Z=RegExp("^"+K.call(Q).replace(/[\\^$.*+?()[\]{}|]/g,"\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),tt=W?q.Buffer:E,W=q.Symbol,et=H.propertyIsEnumerable,rt=D.splice,nt=W?W.toStringTag:E,ot=function(){
+try{var t=b(Object,"defineProperty");return t({},"",{}),t}catch(t){}}(),D=tt?tt.isBuffer:E,ut=function(t,e){return function(r){return t(e(r))}}(Object.keys,Object),it=b(q,"Map"),ct=b(Object,"create"),at=(q=W?W.prototype:E)?q.toString:E;o.prototype.clear=function(){this.__data__=ct?ct(null):{},this.size=0},o.prototype.delete=function(t){return t=this.has(t)&&delete this.__data__[t],this.size-=t?1:0,t},o.prototype.get=function(t){var e=this.__data__;return ct?(t=e[t],"__lodash_hash_undefined__"===t?E:t):Q.call(e,t)?e[t]:E;
+},o.prototype.has=function(t){var e=this.__data__;return ct?e[t]!==E:Q.call(e,t)},o.prototype.set=function(t,e){var r=this.__data__;return this.size+=this.has(t)?0:1,r[t]=ct&&e===E?"__lodash_hash_undefined__":e,this},u.prototype.clear=function(){this.__data__=[],this.size=0},u.prototype.delete=function(t){var e=this.__data__;return t=c(e,t),!(0>t)&&(t==e.length-1?e.pop():rt.call(e,t,1),--this.size,true)},u.prototype.get=function(t){var e=this.__data__;return t=c(e,t),0>t?E:e[t][1]},u.prototype.has=function(t){
+return-1<c(this.__data__,t)},u.prototype.set=function(t,e){var r=this.__data__,n=c(r,t);return 0>n?(++this.size,r.push([t,e])):r[n][1]=e,this},i.prototype.clear=function(){this.size=0,this.__data__={hash:new o,map:new(it||u),string:new o}},i.prototype.delete=function(t){return t=y(this,t).delete(t),this.size-=t?1:0,t},i.prototype.get=function(t){return y(this,t).get(t)},i.prototype.has=function(t){return y(this,t).has(t)},i.prototype.set=function(t,e){var r=y(this,t),n=r.size;return r.set(t,e),this.size+=r.size==n?0:1,
+this};var lt=function(t){t=d(t,function(t){return 500===e.size&&e.clear(),t});var e=t.cache;return t}(function(t){var e=[];return P.test(t)&&e.push(""),t.replace(U,function(t,r,n,o){e.push(n?o.replace(C,"$1"):r||t)}),e});d.Cache=i;var st=s(function(){return arguments}())?s:function(t){return w(t)&&Q.call(t,"callee")&&!et.call(t,"callee")},ft=Array.isArray,pt=D||k,ht=N?e(N):f;n.keys=$,n.memoize=d,n.set=function(t,e,r){if(null!=t&&S(t)){e=h(e,t);for(var n=-1,o=e.length,u=o-1,i=t;null!=i&&++n<o;){var c=j(e[n]),a=r;
+if(n!=u){var l=i[c],a=E;a===E&&(a=S(l)?l:_(e[n+1])?[]:{})}var s=i,l=c,f=s[l];Q.call(s,l)&&m(f,a)&&(a!==E||l in s)||("__proto__"==l&&ot?ot(s,l,{configurable:true,enumerable:true,value:a,writable:true}):s[l]=a),i=i[c]}}return t},n.unset=function(t,e){var r;if(null==t)r=true;else{var n=t,o=r=h(e,n);if(!(2>o.length)){var u=0,i=-1,c=-1,l=o.length;for(0>u&&(u=-u>l?0:l+u),i=i>l?l:i,0>i&&(i+=l),l=u>i?0:i-u>>>0,u>>>=0,i=Array(l);++c<l;)i[c]=o[c+u];n=a(n,i)}r=j(v(r)),r=!(null!=n&&Q.call(n,r))||delete n[r]}return r;
+},n.values=function(t){return null==t?[]:r(t,$(t))},n.eq=m,n.get=function(t,e,r){return t=null==t?E:a(t,e),t===E?r:t},n.isArguments=st,n.isArray=ft,n.isArrayLike=A,n.isBuffer=pt,n.isFunction=O,n.isLength=z,n.isObject=S,n.isObjectLike=w,n.isSymbol=x,n.isTypedArray=ht,n.last=v,n.stubFalse=k,n.toString=F,n.VERSION="4.17.1",G&&((G.exports=n)._=n,V._=n)}).call(this);
Author	SHA1	Message	Date
Sefa Ilkimen	1375727316	release v1.6.2	2017-10-19 17:58:48 +02:00
Sefa Ilkimen	d136d90893	- improved release process (using npm script) - updated version number	2017-10-19 17:56:30 +02:00
Sefa Ilkimen	a8f1d2b1c2	changed behaviour #29 : removed "validateDomainName" function and disabling it when "acceptAllCerts" is enabled	2017-10-19 16:24:54 +02:00
Sefa IlkimenandGitHub	c29ce85df3	Merge pull request #28 from ryandegruyter/patch-1 (iOS) Add support for Content-Type application/hal+json	2017-10-19 09:42:13 +02:00
Sefa Ilkimen	aeefc9f5ef	tests: increased timeout value because test vm takes long time to spin up	2017-10-16 10:57:05 +02:00
Sefa Ilkimen	4ea9c24d6d	travis config: added travis_wait to prevent timeout issue	2017-10-16 10:17:05 +02:00
Sefa Ilkimen	7037fd2fa7	- improved test app - defined new tests	2017-10-13 16:30:48 +02:00
Sefa Ilkimen	6f210a70fb	fixed issue #31 - request fails throwing error on erroneous cookies	2017-10-13 12:16:29 +02:00
Sefa Ilkimen	10eb102d43	fixed travis config (jwt section)	2017-10-12 09:08:03 +02:00
Sefa Ilkimen	9dc0bd56e0	WIP: integrating saucelabs tests	2017-10-11 16:33:07 +02:00
Ryan de GruyterandGitHub	190c44b30a	Add support for Content-Type application/hal+json Currently when the server responds with a content type of application/hal+json, the response might be 200 but the AFNetwork will call the fail callback anyway because the content type is not acceptable.	2017-10-09 13:34:40 +02:00
Sefa Ilkimen	807af7adfa	release 1.6.1	2017-10-04 13:01:50 +02:00
Sefa Ilkimen	dd66698f96	updated version number	2017-10-04 13:00:32 +02:00
Sefa Ilkimen	3476ff7ffb	added script which is updating version number in plugin.xml automatically	2017-10-04 12:59:33 +02:00
Sefa Ilkimen	52b2efe71b	fixed PATCH method on android	2017-10-02 16:17:29 +02:00
Sefa Ilkimen	8b4c6de4b9	implemented PATCH method for iOS	2017-10-02 12:29:55 +02:00
Sefa Ilkimen	3138d423ee	temporary removed patch method in www interface	2017-10-02 11:09:05 +02:00
Sefa IlkimenandGitHub	f0194ad55a	Merge pull request #22 from akhatri/feature-patch-method-android Feature patch method android	2017-10-02 10:50:12 +02:00
Akshat Khatri - AK	09da3c9a97	patch method android	2017-10-01 17:26:20 +11:00
Akshat Khatri - AK	52ccfc6aca	Merge remote-tracking branch 'refs/remotes/silkimen/master' into feature-patch-method-android	2017-10-01 17:11:41 +11:00
Sefa Ilkimen	fc89a64675	update changelog and version number	2017-09-29 16:42:36 +02:00
Sefa Ilkimen	4954385361	- fix issue #16 : removed build script and prebuild hook - implement release script	2017-09-29 16:35:34 +02:00
Sefa IlkimenandGitHub	08554c02cb	Merge pull request #21 from kesozjura/master Add global redirection control	2017-09-29 15:51:56 +02:00
Martin Kasa	18a2fc0c69	temporary umd-tough-cookie.js fix	2017-09-29 14:44:44 +02:00
Martin Kasa	a4a6440bcb	Add global redirection control copied from https://github.com/wymsee/cordova-HTTP/pull/137	2017-09-29 14:36:00 +02:00
Akshat Khatri - AK	792515e1c6	patch method android	2017-09-29 21:02:44 +10:00
Sefa Ilkimen	66dc8ff2ca	changed readme file	2017-09-26 10:48:06 +02:00
Sefa Ilkimen	91b35d561c	- updated version number - updated change log	2017-09-26 10:38:16 +02:00
Sefa IlkimenandGitHub	45c0f8937f	Merge pull request #14 from RangerRick/fix-serialization change setParamSerializer to setDataSerializer (fixes #13)	2017-09-26 11:15:19 +03:00
Sefa IlkimenandGitHub	b1c8427986	Merge pull request #15 from RangerRick/documentation-updates add missing documentation	2017-09-26 11:05:34 +03:00
Benjamin Reed	91470725ee	add missing documentation for setRequestTimeout, removeCookies, and head	2017-09-25 16:12:40 -04:00
Benjamin Reed	7cb41e0c1b	change setParamSerializer to setDataSerializer (fixes #13 )	2017-09-25 14:51:57 -04:00
Sefa Ilkimen	ee8cae88a9	updated change log	2017-09-12 19:05:23 +03:00
Sefa IlkimenandGitHub	aa8105948e	Merge pull request #10 from DayBr3ak/master fix gzip decompression when request header accepts gzip compression	2017-09-12 19:00:31 +03:00
ben	325a2e6200	fix gzip decompression when request header accepts gzip compression	2017-09-12 14:17:52 +02:00
Sefa Ilkimen	8ac8b95246	updated version number	2017-08-21 00:35:24 +02:00
Sefa Ilkimen	5a7f09bc44	updated change log	2017-08-21 00:31:50 +02:00
Sefa Ilkimen	308c49635b	added build batch	2017-08-21 00:23:32 +02:00
Sefa Ilkimen	d2a5a113c6	added slack integration	2017-08-21 00:17:30 +02:00
Sefa Ilkimen	2c4ce6f8c7	fixed travis filename	2017-08-20 23:49:58 +02:00
Sefa Ilkimen	613593ba51	added travis integration (doing test installation)	2017-08-20 23:44:21 +02:00
Jochen Becker	a20821378b	- if a request timed out the same error codes are returned for iOS and Android - updated change log	2017-08-14 17:05:44 +02:00
Sefa Ilkimen	5535464db2	updated change log	2017-08-13 03:05:22 +02:00
Sefa Ilkimen	7ded66d4b8	fix issue #2 : handling "expires" key case-insensitive	2017-08-13 03:01:52 +02:00
Jochen Becker	d84a222dda	- added function "setRequestTimeout" to set the timeout for all further requests and to prevent to "wait forever" on Android in case the server is not responding - updated change log - incremented version for release	2017-08-10 10:03:38 +02:00
Jochen Becker	14eef1ca66	- convert response header keys to lowercase (iOS only) - updated change log - incremented version for release	2017-05-31 08:50:13 +02:00
Jochen Becker	cf5a684d51	- added a function to remove all cookies for a URL - updated change log - incremented version for release	2017-05-23 10:26:51 +02:00
Jochen Becker	c153378b4b	- fixed an error if the response has no "headers" field - updated change log - incremented version for release	2017-03-03 11:11:04 +01:00
Sefa Ilkimen	8092e8b025	- updated change log - incremented version for release	2016-12-19 15:32:13 +01:00
Sefa Ilkimen	afb4ea6199	- handles cookies correctly on non-success response from server - throws error when a callback function is missing	2016-12-12 14:09:41 +01:00
Sefa Ilkimen	2c8c8a14a5	- fixed missing file "umd-tough-cookie.js“ - updated changeling - incremented version for release	2016-12-07 17:21:03 +01:00
Sefa Ilkimen	8267a02c9d	- updated change log - incremented version for release	2016-12-07 16:48:02 +01:00
Sefa Ilkimen	a1f678a886	fixed case-sensitive path for android source files	2016-12-07 16:20:17 +01:00
Sefa Ilkimen	69cf4d0939	- updated change log - incremented version for release	2016-12-07 15:32:18 +01:00
Sefa Ilkimen	d90cefcbaa	fixed handling of multiple cookies	2016-12-07 15:29:54 +01:00
Sefa Ilkimen	b3118d5ccd	removed „String.prototype.startsWith“ call to be compatible with older web view versions	2016-12-06 16:05:48 +01:00
Sefa Ilkimen	6b0f23b2d1	fixed lodash exports	2016-12-06 11:52:38 +01:00
Sefa Ilkimen	d0ece22302	Merge branch 'feature-cookie-handling'	2016-12-06 10:31:54 +01:00
Sefa Ilkimen	a6a1bcaab1	updated readme file	2016-12-06 10:29:35 +01:00
Sefa Ilkimen	4afb375971	added function for clearing cookies	2016-12-05 18:25:14 +01:00
Sefa Ilkimen	20e5bd0ee9	added local storage store for cookies	2016-12-05 17:52:20 +01:00
Sefa Ilkimen	e84d84c358	integrated „umd-tough-cookie“ for cookie handling	2016-12-05 13:19:26 +01:00