release v1.7.0

- validation function is triggered when test is finished

.gitignore

@@ -1,4 +1,5 @@
 node_modules/**
 tags
 .zedstate
+npm-debug.log
 /temp

.travis.yml

@@ -32,7 +32,8 @@ install:
 script:
 - travis_wait scripts/build-test-app.sh
 - scripts/upload-artifact.sh
-- scripts/test.sh --ios --emulator
+- npm run testjs
+- scripts/test-app.sh --ios --emulator
 
 after_success:
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.7.0
+
+- Feature #24: "setHeader" allows configuring headers for specified host
+
 ## v1.6.2
 
 - Change #29: removed "validateDomainName" (see info notice)

README.md

@@ -48,27 +48,32 @@ You can then inject the cordovaHTTP service into your controllers.  The function
 ### getBasicAuthHeader
 This returns an object representing a basic HTTP Authorization header of the form `{'Authorization': 'Basic base64encodedusernameandpassword'}`
 
-    var header = cordovaHTTP.getBasicAuthHeader("user", "password");
+    var header = cordova.plugin.http.getBasicAuthHeader("user", "password");
 
 ### useBasicAuth
 This sets up all future requests to use Basic HTTP authentication with the given username and password.
 
-    cordovaHTTP.useBasicAuth("user", "password");
+    cordova.plugin.http.useBasicAuth("user", "password");
 
 ### setHeader
-Set a header for all future requests.  Takes a header and a value.
+Set a header for all future requests to a specified host. Takes a hostname, a header and a value.
 
-    cordovaHTTP.setHeader("Header", "Value");
+    cordova.plugin.http.setHeader("Hostname", "Header", "Value");
+
+You can also define headers used for all hosts by using wildcard character "\*" or providing only two params.
+
+    cordova.plugin.http.setHeader("\*", "Header", "Value");
+    cordova.plugin.http.setHeader("Header", "Value");
 
 ### disableRedirect
 If set to `true`, it won't follow redirects automatically. This is a global setting.
 
-    cordovaHTTP.disableRedirect(true);
+    cordova.plugin.http.disableRedirect(true);
 
 ### setDataSerializer
-Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.
+Set the data serializer which will be used for all future PATCH, POST and PUT requests. Takes a string representing the name of the serializer.
 
-    cordovaHTTP.setDataSerializer("urlencoded");
+    cordova.plugin.http.setDataSerializer("urlencoded");
 
 You can choose one of these two:
 * `urlencoded`: send data as url encoded content in body (content type "application/x-www-form-urlencoded")
@@ -79,12 +84,12 @@ Caution: `urlencoded` does not support serializing deep structures whereas `json
 ### setRequestTimeout
 Set how long to wait for a request to respond, in seconds.
 
-    cordovaHTTP.setRequestTimeout(5.0);
+    cordova.plugin.http.setRequestTimeout(5.0);
 
 ### clearCookies
 Clear the cookie store.
 
-    cordovaHTTP.clearCookies();
+    cordova.plugin.http.clearCookies();
 
 ## Asynchronous Functions
 These functions all take success and error callbacks as their last 2 arguments.
@@ -96,7 +101,7 @@ To use SSL pinning you must include at least one .cer SSL certificate in your ap
 
 As an alternative, you can store your .cer files in the www/certificates folder.
 
-    cordovaHTTP.enableSSLPinning(true, function() {
+    cordova.plugin.http.enableSSLPinning(true, function() {
         console.log('success!');
     }, function() {
         console.log('error :(');
@@ -105,7 +110,7 @@ As an alternative, you can store your .cer files in the www/certificates folder.
 ### acceptAllCerts
 Accept all SSL certificates.  Or disable accepting all certificates.  This defaults to false.
 
-    cordovaHTTP.acceptAllCerts(true, function() {
+    cordova.plugin.http.acceptAllCerts(true, function() {
         console.log('success!');
     }, function() {
         console.log('error :(');
@@ -117,7 +122,7 @@ This function was removed in v1.6.2. Domain name validation is disabled automati
 ### removeCookies
 Remove all cookies associated with a given URL.
 
-    cordovaHTTP.removeCookies(url);
+    cordova.plugin.http.removeCookies(url);
 
 ### post<a name="post"></a>
 Execute a POST request.  Takes a URL, data, and headers.
@@ -135,7 +140,7 @@ The success function receives a response object with 3 properties: status, data,
 
 Most apis will return JSON meaning you'll want to parse the data like in the example below:
 
-    cordovaHTTP.post("https://google.com/", {
+    cordova.plugin.http.post("https://google.com/", {
         id: 12,
         message: "test"
     }, { Authorization: "OAuth2: token" }, function(response) {
@@ -171,7 +176,7 @@ The error function receives a response object with 3 properties: status, error a
 ### get
 Execute a GET request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
 
-    cordovaHTTP.get("https://google.com/", {
+    cordova.plugin.http.get("https://google.com/", {
         id: 12,
         message: "test"
     }, { Authorization: "OAuth2: token" }, function(response) {
@@ -183,6 +188,9 @@ Execute a GET request.  Takes a URL, parameters, and headers.  See the [post](#p
 ### put
 Execute a PUT request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
 
+### patch
+Execute a PATCH request.  Takes a URL, data, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
+
 ### delete
 Execute a DELETE request.  Takes a URL, parameters, and headers.  See the [post](#post) documentation for details on what is returned on success and failure.
 
@@ -192,7 +200,7 @@ Execute a HEAD request.  Takes a URL, parameters, and headers.  See the [post](#
 ### uploadFile
 Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath, and the name of the parameter to pass the file along as.  See the [post](#post) documentation for details on what is returned on success and failure.
 
-    cordovaHTTP.uploadFile("https://google.com/", {
+    cordova.plugin.http.uploadFile("https://google.com/", {
         id: 12,
         message: "test"
     }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", "picture", function(response) {
@@ -204,7 +212,7 @@ Uploads a file saved on the device.  Takes a URL, parameters, headers, filePath,
 ### downloadFile
 Downloads a file and saves it to the device.  Takes a URL, parameters, headers, and a filePath.  See [post](#post) documentation for details on what is returned on failure.  On success this function returns a cordova [FileEntry object](http://cordova.apache.org/docs/en/3.3.0/cordova_file_file.md.html#FileEntry).
 
-    cordovaHTTP.downloadFile("https://google.com/", {
+    cordova.plugin.http.downloadFile("https://google.com/", {
         id: 12,
         message: "test"
     }, { Authorization: "OAuth2: token" }, "file:///somepicture.jpg", function(entry) {

package.json

@@ -1,9 +1,11 @@
 {
   "name": "cordova-plugin-advanced-http",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
   "scripts": {
-    "test": "./scripts/build-test-app.sh && ./scripts/test.sh --ios --emulator",
+    "testapp": "./scripts/build-test-app.sh && ./scripts/test-app.sh --ios --emulator",
+    "testjs": "mocha ./test/js-mocha-specs.js",
+    "test": "npm run testjs && npm run testapp",
     "release": "npm run test && ./scripts/release.sh"
   },
   "cordova": {
@@ -55,6 +57,7 @@
     "colors": "1.1.2",
     "cordova": "7.0.1",
     "mocha": "4.0.0",
+    "mock-require": "2.0.2",
     "mz": "2.7.0",
     "umd-tough-cookie": "2.3.2",
     "wd": "1.4.1",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="1.6.2">
+<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-advanced-http" version="1.7.0">
   <name>Advanced HTTP plugin</name>
   <description>
         Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning

scripts/build-test-app.sh

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

scripts/test-app.sh

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

test/app-mocha-specs/test.js

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

test/app-template/www/css/index.css

@@ -18,6 +18,10 @@ button, input, textarea {
   width: 100%;
 }
 
+input {
+  text-align: center;
+}
+
 h1 {
   font-size: 12pt;
   text-align: center;

test/app-template/www/index.html

@@ -9,12 +9,13 @@
     </head>
     <body>
         <h1 id="descriptionLbl">Advanced HTTP test suite</h1>
+        <input value="idle" id="statusInput" readonly></input>
         <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/app-test-definitions.js"></script>
         <script type="text/javascript" src="js/index.js"></script>
     </body>
 </html>

test/app-template/www/js/index.js

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

test/app-test-definitions.js

@@ -0,0 +1,111 @@
+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); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error:'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (PUT)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error:'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (POST)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error:'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (PATCH)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error:'cancelled' });
+    }
+  },{
+    description: 'should reject self signed cert (DELETE)',
+    expected: 'rejected: {"status":-1,"error":"cancelled"}',
+    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.be.eql({ status: -1, error:'cancelled' });
+    }
+  },{
+    description: 'should accept bad cert (GET)',
+    expected: 'resolved: {\"status\":200, ...',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.get('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.should.include({ status: 200 });
+    }
+  },{
+    description: 'should accept bad cert (PUT)',
+    expected: 'rejected: {\"status\":405, ... // will be rejected because PUT is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.put('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should accept bad cert (POST)',
+    expected: 'rejected: {\"status\":405, ... // will be rejected because POST is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.post('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should accept bad cert (PATCH)',
+    expected: 'rejected: {\"status\":405, ... // will be rejected because PATCH is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.patch('https://self-signed.badssl.com/', { test: 'testString' }, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should accept bad cert (DELETE)',
+    expected: 'rejected: {\"status\":405, ... // will be rejected because DELETE is not allowed',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.delete('https://self-signed.badssl.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('rejected');
+      result.data.should.include({ status: 405 });
+    }
+  },{
+    description: 'should fetch data from http://google.com/ (GET)',
+    expected: 'resolved: {\"status\":200, ...',
+    before: helpers.acceptAllCerts,
+    func: function(resolve, reject) { cordova.plugin.http.get('http://google.com/', {}, {}, resolve, reject); },
+    validationFunc: function(driver, result) {
+      result.type.should.be.equal('resolved');
+      result.data.should.include({ status: 200 });
+    }
+  }
+];
+
+if (typeof module !== 'undefined' && module.exports) {
+  module.exports = { tests: tests, hooks: hooks };
+}

test/js-mocha-specs.js

@@ -0,0 +1,94 @@
+const chai = require('chai');
+const mock = require('mock-require');
+const path = require('path');
+
+const should = chai.should();
+const PLUGIN_ID = path.resolve(__dirname, '..', 'www', 'advanced-http');
+
+describe('Advanced HTTP www interface', function() {
+  let http = {};
+  const noop = () => { /* intentionally doing nothing */ };
+  const loadHttp = () => {
+    http = mock.reRequire('../www/advanced-http');
+  };
+
+  this.timeout(900000);
+
+  beforeEach(() => {
+    mock('cordova/exec', noop);
+    mock(`${PLUGIN_ID}.angular-integration`, { registerService: noop });
+    mock(`${PLUGIN_ID}.cookie-handler`, {});
+    loadHttp();
+  });
+
+  it('sets global headers correctly with two args (old interface)', () => {
+    http.setHeader('myKey', 'myValue');
+    http.headers['*'].myKey.should.equal('myValue');
+  });
+
+  it('sets global headers correctly with three args (new interface)', () => {
+    http.setHeader('*', 'myKey', 'myValue');
+    http.headers['*'].myKey.should.equal('myValue');
+  });
+
+  it('sets host headers correctly', () => {
+    http.setHeader('www.google.de', 'myKey', 'myValue');
+    http.headers['www.google.de'].myKey.should.equal('myValue');
+  });
+
+  it('resolves global headers correctly', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.setHeader('*', 'myKey', 'myValue');
+    http.get('url', {}, {}, noop, noop);
+  });
+
+  it('resolves host headers correctly', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.setHeader('www.google.de', 'myKey', 'myValue');
+    http.get('https://www.google.de/?gws_rd=ssl', {}, {}, noop, noop);
+  });
+
+  it('resolves request headers correctly', () => {
+    mock(`${PLUGIN_ID}.cookie-handler`, {
+      getCookieString: () => 'fakeCookieString'
+    });
+
+    mock('cordova/exec', (onSuccess, onFail, namespace, method, params) => {
+      const headers = params[2];
+      headers.should.eql({
+        Cookie: 'fakeCookieString',
+        myKey: 'myValue'
+      });
+    });
+
+    loadHttp();
+
+    http.get('https://www.google.de/?gws_rd=ssl', {}, { myKey: 'myValue' }, noop, noop);
+  });
+});

test/test-definitions.js

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

www/advanced-http.js

@@ -114,6 +114,24 @@ function getCookieHeader(url) {
     return { Cookie: cookieHandler.getCookieString(url) };
 }
 
+function getMatchingHostHeaders(url, headersList) {
+    var matches = url.match(/^https?\:\/\/([^\/?#]+)(?:[\/?#]|$)/i);
+    var domain = matches && matches[1];
+
+    return headersList[domain] || null;
+}
+
+function getMergedHeaders(url, requestHeaders, predefinedHeaders) {
+  var globalHeaders = predefinedHeaders['*'] || {};
+  var hostHeaders = getMatchingHostHeaders(url, predefinedHeaders) || {};
+  var mergedHeaders = mergeHeaders(globalHeaders, hostHeaders);
+
+  mergedHeaders = mergeHeaders(mergedHeaders, requestHeaders);
+  mergedHeaders = mergeHeaders(mergedHeaders, getCookieHeader(url));
+
+  return mergedHeaders;
+}
+
 function handleMissingCallbacks(successFn, failFn) {
     if (Object.prototype.toString.call(successFn) !== '[object Function]') {
         throw new Error('advanced-http: missing mandatory "onSuccess" callback function');
@@ -133,10 +151,22 @@ var http = {
         return {'Authorization': 'Basic ' + b64EncodeUnicode(username + ':' + password)};
     },
     useBasicAuth: function (username, password) {
-        this.headers.Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
+        this.headers['*'].Authorization = 'Basic ' + b64EncodeUnicode(username + ':' + password);
     },
-    setHeader: function (header, value) {
-        this.headers[header] = value;
+    setHeader: function () {
+        // this one is for being backward compatible
+        var host = '*';
+        var header = arguments[0];
+        var value = arguments[1];
+
+        if (arguments.length === 3) {
+            host = arguments[0];
+            header = arguments[1];
+            value = arguments[2];
+        }
+
+        this.headers[host] = this.headers[host] || {};
+        this.headers[host][header] = value;
     },
     setDataSerializer: function (serializer) {
         this.dataSerializer = checkSerializer(serializer);
@@ -166,9 +196,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -179,9 +207,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -192,9 +218,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -206,9 +230,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         data = data || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -220,9 +242,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -233,9 +253,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -246,9 +264,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, success);
         var onFail = injectCookieHandler(url, failure);
@@ -259,9 +275,7 @@ var http = {
         handleMissingCallbacks(success, failure);
 
         params = params || {};
-        headers = headers || {};
-        headers = mergeHeaders(this.headers, headers);
-        headers = mergeHeaders(getCookieHeader(url), headers);
+        headers = getMergedHeaders(url, headers, this.headers);
 
         var onSuccess = injectCookieHandler(url, injectFileEntryHandler(success));
         var onFail = injectCookieHandler(url, failure);

www/angular-integration.js

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