diff --git a/acme.js b/acme.js index 1c35d4c..4c9a398 100644 --- a/acme.js +++ b/acme.js @@ -1055,9 +1055,7 @@ ACME._pollOrderStatus = function (me, options, kid, order, verifieds) { } if ('invalid' === resp.body.status) { - return Promise.reject( - E.ORDER_INVALID(options, verifieds, resp) - ); + return Promise.reject(E.ORDER_INVALID(options, verifieds, resp)); } if ('ready' === resp.body.status) { @@ -1102,7 +1100,7 @@ ACME._redeemCert = function (me, options, kid, voucher) { url: voucher._certificateUrl, protected: { kid: kid }, payload: Enc.binToBuf(''), - json: true + headers: { Accept: 'application/pem-certificate-chain' } }).then(function (resp) { //#console.debug('ACME.js: csr submitted and cert received:'); diff --git a/utils.js b/utils.js index 5c0d1bc..9cf0efa 100644 --- a/utils.js +++ b/utils.js @@ -28,7 +28,7 @@ U._jwsRequest = function (me, bigopts) { .then(function (jws) { //#console.debug('[ACME.js] url: ' + bigopts.url + ':'); //#console.debug(jws); - return U._request(me, { url: bigopts.url, json: jws }); + return U._request(me, { url: bigopts.url, json: jws, headers: bigopts.headers }); }) .catch(function (e) { if (/badNonce$/.test(e.urn)) { @@ -84,7 +84,9 @@ U._request = function (me, opts) { opts.headers['User-Agent'] = ua; } if (opts.json) { - opts.headers.Accept = 'application/json'; + if (!opts.headers.Accept) { + opts.headers.Accept = 'application/json'; + } if (true !== opts.json) { opts.body = JSON.stringify(opts.json); }