suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't inject fetch polyfill in hkp module anymore

Browse Source
This commit is contained in:
Tankred Hase 2016-01-29 20:03:11 +07:00
parent 8070120b45
commit dec7881f93
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gruntfile.js
View File

@ -18,7 +18,7 @@ module.exports = function(grunt) {
browserifyOptions: { browserifyOptions: {
standalone: 'openpgp' standalone: 'openpgp'
}, },
external: [ 'crypto', 'node-localstorage' ] external: [ 'crypto', 'node-localstorage', 'node-fetch' ]
} }
}, },
openpgp_debug: { openpgp_debug: {
@ -30,7 +30,7 @@ module.exports = function(grunt) {
debug: true, debug: true,
standalone: 'openpgp' standalone: 'openpgp'
}, },
external: [ 'crypto', 'node-localstorage' ] external: [ 'crypto', 'node-localstorage', 'node-fetch' ]
} }
}, },
worker: { worker: {
@ -48,7 +48,7 @@ module.exports = function(grunt) {
'test/lib/unittests-bundle.js': [ './test/unittests.js' ] 'test/lib/unittests-bundle.js': [ './test/unittests.js' ]
}, },
options: { options: {
external: ['crypto', 'node-localstorage', 'openpgp', '../../../dist/openpgp', '../../dist/openpgp'] external: [ 'crypto', 'node-localstorage', 'node-fetch', 'openpgp', '../../dist/openpgp', '../../../dist/openpgp' ]
} }
} }
}, },

8
src/hkp/hkp.js
View File

@ -31,14 +31,10 @@ var config = require('../config');
* @constructor * @constructor
* @param {String} keyServerBaseUrl (optional) The HKP key server base url including * @param {String} keyServerBaseUrl (optional) The HKP key server base url including
* the protocol to use e.g. https://pgp.mit.edu * the protocol to use e.g. https://pgp.mit.edu
* @param {function} fetch (optional) The fetch function is an easier way
* to make web requests and handle responses than using an XMLHttpRequest. You can
* pass in a custom implementaion or just leave the parameter empty to fall back to
* window.fetch (https://fetch.spec.whatwg.org).
*/ */
function HKP(keyServerBaseUrl, fetch) { function HKP(keyServerBaseUrl) {
this._baseUrl = keyServerBaseUrl ? keyServerBaseUrl : config.keyserver; this._baseUrl = keyServerBaseUrl ? keyServerBaseUrl : config.keyserver;
this._fetch = fetch ? fetch : typeof window !== 'undefined' && window.fetch; this._fetch = typeof window !== 'undefined' ? window.fetch : require('node-fetch');
} }
/** /**

3
test/general/hkp.js
View File

@ -1,7 +1,6 @@
'use strict'; 'use strict';
var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp'); var openpgp = typeof window !== 'undefined' && window.openpgp ? window.openpgp : require('../../dist/openpgp');
var fetch = typeof window !== 'undefined' ? window.fetch : require('node-fetch');
var chai = require('chai'), var chai = require('chai'),
expect = chai.expect; expect = chai.expect;
@ -108,7 +107,7 @@ describe('HKP unit tests', function() {
'-----END PGP PUBLIC KEY BLOCK-----'; '-----END PGP PUBLIC KEY BLOCK-----';
beforeEach(function() { beforeEach(function() {
hkp = new openpgp.HKP(openpgp.config.keyserver, fetch); hkp = new openpgp.HKP(openpgp.config.keyserver);
}); });
afterEach(function() {}); afterEach(function() {});