mirror of
https://github.com/silkimen/cordova-plugin-advanced-http.git
synced 2026-05-31 00:00:07 +08:00
integrated „umd-tough-cookie“ for cookie handling
This commit is contained in:
+3
-1
@@ -1,2 +1,4 @@
|
||||
node_modules/**
|
||||
tags
|
||||
.zedstate
|
||||
.zedstate
|
||||
/www/umd-tough-cookie.js
|
||||
|
||||
@@ -208,8 +208,7 @@ We made a few modifications to http-request. They can be found in a separate re
|
||||
|
||||
## Cookies
|
||||
|
||||
- a cookie set by a request isn't sent in subsequent requests
|
||||
|
||||
Cookies are not persisted, they are hold in memory. They are gone when you close the app or even if you do a `window.location` change.
|
||||
Take this into account when using this plugin in your application.
|
||||
|
||||
## License
|
||||
|
||||
+7
-1
@@ -2,6 +2,9 @@
|
||||
"name": "cordova-plugin-advanced-http",
|
||||
"version": "1.4.0",
|
||||
"description": "Cordova / Phonegap plugin for communicating with HTTP servers using SSL pinning",
|
||||
"scripts": {
|
||||
"build": "cp node_modules/umd-tough-cookie/lib/umd-tough-cookie.js www/umd-tough-cookie.js"
|
||||
},
|
||||
"cordova": {
|
||||
"id": "cordova-plugin-advanced-http",
|
||||
"platforms": [
|
||||
@@ -44,5 +47,8 @@
|
||||
"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": {
|
||||
"umd-tough-cookie": "2.3.2"
|
||||
}
|
||||
}
|
||||
|
||||
+7
-1
@@ -16,7 +16,13 @@
|
||||
|
||||
<dependency id="cordova-plugin-file" version=">=2.0.0" />
|
||||
|
||||
<js-module src="www/cordovaHttp.js" name="http">
|
||||
<js-module src="www/angular-integration.js" name="angular-integration">
|
||||
</js-module>
|
||||
<js-module src="www/umd-tough-cookie.js" name="tough-cookie">
|
||||
</js-module>
|
||||
<js-module src="www/cookie-handler.js" name="cookie-handler">
|
||||
</js-module>
|
||||
<js-module src="www/advanced-http.js" name="http">
|
||||
<clobbers target="cordova.plugin.http" />
|
||||
</js-module>
|
||||
|
||||
|
||||
@@ -29,9 +29,13 @@
|
||||
* An HTTP Plugin for PhoneGap.
|
||||
*/
|
||||
|
||||
var exec = require('cordova/exec');
|
||||
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) {
|
||||
@@ -42,24 +46,50 @@ function b64EncodeUnicode(str) {
|
||||
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();
|
||||
serializer = serializer || '';
|
||||
serializer = serializer.trim().toLowerCase();
|
||||
|
||||
if (validSerializers.indexOf(serializer) > -1) {
|
||||
return serializer;
|
||||
}
|
||||
if (validSerializers.indexOf(serializer) > -1) {
|
||||
return serializer;
|
||||
}
|
||||
|
||||
return serializer[0];
|
||||
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 getSuccessHandler(url, cb) {
|
||||
return function(response) {
|
||||
cookieHandler.setCookie(url, resolveCookieString(response.headers));
|
||||
cb(response);
|
||||
}
|
||||
}
|
||||
|
||||
function getCookieHeader(url) {
|
||||
return { Cookie: cookieHandler.getCookie(url) };
|
||||
}
|
||||
|
||||
var http = {
|
||||
@@ -91,36 +121,50 @@ var http = {
|
||||
data = data || {};
|
||||
headers = headers || {};
|
||||
headers = mergeHeaders(this.headers, headers);
|
||||
return exec(success, failure, 'CordovaHttpPlugin', 'post', [url, data, this.dataSerializer, headers]);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
return exec(getSuccessHandler(url, 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]);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
return exec(getSuccessHandler(url, 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]);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
return exec(getSuccessHandler(url, 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]);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
return exec(getSuccessHandler(url, 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]);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
return exec(getSuccessHandler(url, 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]);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
return exec(getSuccessHandler(url, success), failure, 'CordovaHttpPlugin', 'uploadFile', [url, params, headers, filePath, name]);
|
||||
},
|
||||
downloadFile: function (url, params, headers, filePath, success, failure) {
|
||||
headers = mergeHeaders(this.headers, headers);
|
||||
headers = mergeHeaders(getCookieHeader(url), headers);
|
||||
|
||||
var win = function (result) {
|
||||
var entry = new (require('cordova-plugin-file.FileEntry'))();
|
||||
entry.isDirectory = false;
|
||||
@@ -131,87 +175,10 @@ var http = {
|
||||
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;
|
||||
});
|
||||
}
|
||||
|
||||
angularIntegration.registerService(http);
|
||||
module.exports = http;
|
||||
Vendored
+84
@@ -0,0 +1,84 @@
|
||||
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.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 = {
|
||||
registerService: registerService
|
||||
};
|
||||
@@ -0,0 +1,17 @@
|
||||
var pluginId = module.id.slice(0, module.id.indexOf('.'));
|
||||
var ToughCookie = require(pluginId + '.tough-cookie');
|
||||
var cookieJar = new ToughCookie.CookieJar();
|
||||
|
||||
module.exports = {
|
||||
setCookie: setCookie,
|
||||
getCookie: getCookie
|
||||
}
|
||||
|
||||
function setCookie(url, cookieStr) {
|
||||
if (!cookieStr) return;
|
||||
cookieJar.setCookieSync(cookieStr, url);
|
||||
}
|
||||
|
||||
function getCookie(url) {
|
||||
return cookieJar.getCookieStringSync(url);
|
||||
}
|
||||
Reference in New Issue
Block a user