just a little more...
This commit is contained in:
parent
d1c0043f34
commit
635b130ab3
4
index.js
4
index.js
|
@ -99,12 +99,12 @@ LE.create = function (le) {
|
|||
}
|
||||
|
||||
le.register = function (args) {
|
||||
return le.core.registerAsync(args);
|
||||
return le.core.certificates.getAsync(args);
|
||||
};
|
||||
|
||||
le.check = function (args) {
|
||||
// TODO must return email, domains, tos, pems
|
||||
return le.core.fetchAsync(args);
|
||||
return le.core.certificates.checkAsync(args);
|
||||
};
|
||||
|
||||
le.middleware = function () {
|
||||
|
|
73
lib/core.js
73
lib/core.js
|
@ -113,16 +113,28 @@ module.exports.create = function (le) {
|
|||
}
|
||||
|
||||
, certificates: {
|
||||
// getCertificateAsync:
|
||||
registerAsync: function (args) {
|
||||
var err;
|
||||
var copy = utils.merge(args, le);
|
||||
args = utils.tplCopy(copy);
|
||||
|
||||
function log() {
|
||||
if (args.debug || le.debug) {
|
||||
console.log.apply(console, arguments);
|
||||
}
|
||||
if (!Array.isArray(args.domains)) {
|
||||
return PromiseA.reject(new Error('args.domains should be an array of domains'));
|
||||
}
|
||||
|
||||
var account = args.account;
|
||||
if (!(args.domains.length && args.domains.every(utils.isValidDomain))) {
|
||||
// NOTE: this library can't assume to handle the http loopback
|
||||
// (or dns-01 validation may be used)
|
||||
// so we do not check dns records or attempt a loopback here
|
||||
err = new Error("invalid domain name(s): '" + args.domains + "'");
|
||||
err.code = "INVALID_DOMAIN";
|
||||
return PromiseA.reject(err);
|
||||
}
|
||||
|
||||
return core.accounts.getAsync(copy).then(function (account) {
|
||||
copy.account = account;
|
||||
|
||||
//var account = args.account;
|
||||
var keypairOpts = { public: true, pem: true };
|
||||
|
||||
var promise = le.store.certificates.checkKeypairAsync(args).then(function (keypair) {
|
||||
|
@ -136,8 +148,6 @@ module.exports.create = function (le) {
|
|||
});
|
||||
|
||||
return promise.then(function (domainKeypair) {
|
||||
log("[le/core.js] get certificate");
|
||||
|
||||
args.domainKeypair = domainKeypair;
|
||||
//args.registration = domainKey;
|
||||
|
||||
|
@ -192,20 +202,22 @@ module.exports.create = function (le) {
|
|||
// { cert, chain, fullchain, privkey }
|
||||
|
||||
args.pems = results;
|
||||
return le.store.certificates.setAsync(args);
|
||||
return le.store.certificates.setAsync(args).then(function () {
|
||||
return results;
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
// checkAsync
|
||||
, checkAsync: function (args) {
|
||||
var copy = utils.merge(args, le);
|
||||
utils.tplCopy(copy);
|
||||
|
||||
// returns pems
|
||||
return le.store.certificates.checkAsync(copy).then(utils.attachCertInfo);
|
||||
}
|
||||
// getOrCreateDomainCertificate
|
||||
, getAsync: function (args) {
|
||||
var copy = utils.merge(args, le);
|
||||
utils.tplCopy(copy);
|
||||
args = utils.tplCopy(copy);
|
||||
|
||||
if (args.duplicate) {
|
||||
// we're forcing a refresh via 'dupliate: true'
|
||||
|
@ -229,44 +241,13 @@ module.exports.create = function (le) {
|
|||
+ new Date(certs.expiresAt).toISOString() + "'. Ignoring renewal attempt until half-life at '"
|
||||
+ new Date(renewableAt).toISOString() + "'. Set { duplicate: true } to force."
|
||||
));
|
||||
}).then(function (results) {
|
||||
// returns pems
|
||||
return results;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
// returns 'account' from lib/accounts { meta, regr, keypair, accountId (id) }
|
||||
, registerAsync: function (args) {
|
||||
var err;
|
||||
|
||||
if (!Array.isArray(args.domains)) {
|
||||
return PromiseA.reject(new Error('args.domains should be an array of domains'));
|
||||
}
|
||||
|
||||
if (!(args.domains.length && args.domains.every(utils.isValidDomain))) {
|
||||
// NOTE: this library can't assume to handle the http loopback
|
||||
// (or dns-01 validation may be used)
|
||||
// so we do not check dns records or attempt a loopback here
|
||||
err = new Error("invalid domain name(s): '" + args.domains + "'");
|
||||
err.code = "INVALID_DOMAIN";
|
||||
return PromiseA.reject(err);
|
||||
}
|
||||
|
||||
var copy = utils.merge(args, le);
|
||||
utils.tplCopy(copy);
|
||||
|
||||
return core.accounts.getAsync(copy).then(function (account) {
|
||||
copy.account = account;
|
||||
|
||||
return backend.getOrCreateRenewal(copy).then(function (pyobj) {
|
||||
|
||||
copy.pyobj = pyobj;
|
||||
return core.certificates.getAsync(copy);
|
||||
});
|
||||
}).then(function (result) {
|
||||
return result;
|
||||
}, function (err) {
|
||||
return PromiseA.reject(err);
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
return core;
|
||||
|
|
|
@ -75,4 +75,6 @@ module.exports.tplCopy = function (copy) {
|
|||
copy[key] = copy[key].replace(':' + tplname, tpls[tplname]);
|
||||
});
|
||||
});
|
||||
|
||||
return copy;
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue