coolaj86
/
greenlock.js-ARCHIVED
3
3
Fork 0
Code Issues 6 Pull Requests 1 Releases Activity

v2.7.13: more backwards-forwards compat/bugfixes

This commit is contained in:
AJ ONeal 2019-04-07 09:22:38 -06:00
parent ddaebd9387
commit 461ad43620
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
index.js
View File

@ -28,7 +28,7 @@ function promisifyAllStore(obj) {
var p; var p;
if (1 === obj[key].length) { if (1 === obj[key].length) {
// wrap just in case it's synchronous (or improperly throws) // wrap just in case it's synchronous (or improperly throws)
p = function (opts) { return PromiseA.resolve().then(function () { obj[key](opts); }) }; p = function (opts) { return PromiseA.resolve().then(function () { obj[key](opts); }); };
} else { } else {
p = util.promisify(obj[key]); p = util.promisify(obj[key]);
} }
@ -468,12 +468,15 @@ Greenlock.create = function (gl) {
var options = results.options || results; var options = results.options || results;
if (opts !== options) { if (opts !== options) {
Object.keys(options).forEach(function (key) { Object.keys(options).forEach(function (key) {
if ('undefined' !== typeof options[key]) { if ('undefined' !== typeof options[key] && 'domain' !== key) {
opts[key] = options[key]; opts[key] = options[key];
} }
}); });
options = opts; options = opts;
} }
if (Array.isArray(options.altnames) && options.altnames.length) {
options.domains = options.altnames;
}
// just in case we get a completely different object from the one we originally created // just in case we get a completely different object from the one we originally created
if (!options.account) { options.account = {}; } if (!options.account) { options.account = {}; }
if (!options.certificate) { options.certificate = {}; } if (!options.certificate) { options.certificate = {}; }

2
lib/core.js
View File

@ -402,7 +402,7 @@ module.exports.create = function (gl) {
Object.keys(challenge).forEach(function (key) { Object.keys(challenge).forEach(function (key) {
done[key] = challenge[key]; done[key] = challenge[key];
}); });
gl.challenges[challenge.type].remove(copy, challenge.altname, challenge.keyAuthorization, done); gl.challenges[challenge.type].remove(copy, challenge.altname, challenge.token, done);
} }
}; };

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.7.12", "version": "2.7.13",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "greenlock", "name": "greenlock",
"version": "2.7.12", "version": "2.7.13",
"description": "Let's Encrypt for node.js on npm", "description": "Let's Encrypt for node.js on npm",
"main": "index.js", "main": "index.js",
"files": [ "files": [