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

testing the latest and fixing stuff

This commit is contained in:
AJ ONeal 2016-08-16 12:35:18 -04:00
parent 9503be9991
commit 7b71e0bd38
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
index.js
View File

@ -135,14 +135,17 @@ LE.create = function (le) {
}); });
LE.challengeTypes.forEach(function (challengeType) { LE.challengeTypes.forEach(function (challengeType) {
if (!le.challenges[challengeType]) {
return;
}
if (le.challenges[challengeType].create) { if (le.challenges[challengeType].create) {
le.challenges[challengeType] = le.challenges[challengeType].create(le); le.challenges[challengeType] = le.challenges[challengeType].create(le);
} }
le.challenges[challengeType] = PromiseA.promisifyAll(le.challenges[challengeType]); le.challenges[challengeType] = PromiseA.promisifyAll(le.challenges[challengeType]);
le['_challengeOpts_' + challengeType] = le.challenges[challengeType].getOptions(); le['_challengeOpts_' + challengeType] = le.challenges[challengeType].getOptions();
Object.keys(le._challengeOpts).forEach(function (key) { Object.keys(le['_challengeOpts_' + challengeType]).forEach(function (key) {
if (!(key in le)) { if (!(key in le)) {
le[key] = le._challengeOpts[key]; le[key] = le['_challengeOpts_' + challengeType][key];
} }
}); });
}); });
@ -158,7 +161,7 @@ LE.create = function (le) {
} }
} }
else { else {
le.challenge = le.challenge[le.challengeType]; le.challenge = le.challenges[le.challengeType];
} }
le._challengeOpts = le.challenge.getOptions(); le._challengeOpts = le.challenge.getOptions();
@ -174,12 +177,15 @@ LE.create = function (le) {
} }
le.approveDomains = function (lexOpts, certs, cb) { le.approveDomains = function (lexOpts, certs, cb) {
if (lexOpts.domains.every(function (domain) { if (lexOpts.domains.every(function (domain) {
return -1 !== lexOpts.approvedDomains.indexOf(domain); return -1 !== le.approvedDomains.indexOf(domain);
})) { })) {
lexOpts.domains = le.approvedDomains.slice(0); lexOpts.domains = le.approvedDomains.slice(0);
lexOpts.email = le.email; lexOpts.email = le.email;
lexOpts.agreeTos = le.agreeTos; lexOpts.agreeTos = le.agreeTos;
return cb(null, lexOpts); return cb(null, { options: lexOpts, certs: certs });
}
if (le.debug) {
console.log('unapproved domain', lexOpts.domains, le.approvedDomains);
} }
cb(new Error("unapproved domain")); cb(new Error("unapproved domain"));
}; };
@ -244,6 +250,10 @@ LE.create = function (le) {
le.core = le.core.create(le); le.core = le.core.create(le);
} }
le.renew = function (args, certs) {
return le.core.certificates.renewAsync(args, certs);
};
le.register = function (args) { le.register = function (args) {
return le.core.certificates.getAsync(args); return le.core.certificates.getAsync(args);
}; };