app.js

@@ -138,6 +138,7 @@
           accountStuff.privateJwk = privJwk;
           accountStuff.email = email;
           accountStuff.acme = acme;
+          $('.js-create-order').hidden = false;
         }).catch(function (err) {
           console.error("A bad thing happened:");
           console.error(err);
@@ -149,26 +150,7 @@
     $('form.js-csr').addEventListener('submit', function (ev) {
       ev.preventDefault();
       ev.stopPropagation();
-      var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
+      generateCsr();
-      //var privJwk = JSON.parse($('.js-jwk').innerText).private;
-      return Keypairs.generate({
-        kty: $('input[name="kty"]:checked').value
-      , namedCurve: $('input[name="ec-crv"]:checked').value
-      , modulusLength: $('input[name="rsa-len"]:checked').value
-      }).then(function (pair) {
-        console.log('domain keypair:', pair);
-        accountStuff.domainPrivateJwk = pair.private;
-        return CSR({ jwk: pair.private, domains: domains }).then(function (pem) {
-          // Verify with https://www.sslshopper.com/csr-decoder.html
-          accountStuff.csr = pem;
-          console.log('CSR:');
-          console.log(pem);
-
-          console.log('CSR info:');
-          console.log(CSR._info(pem));
-          $('.js-create-order').hidden = false;
-        });
-      });
     });
 
     $('form.js-acme-order').addEventListener('submit', function (ev) {
@@ -181,6 +163,7 @@
 
 
       var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
+      return getDomainPrivkey().then(function () {
         return acme.certificates.create({
           accountKeypair: { privateKeyJwk: privJwk }
         , account: account
@@ -236,9 +219,42 @@
           window.alert("failed! " + err.message || JSON.stringify(err));
         });
       });
+    });
 
     $('.js-generate').hidden = false;
   }
 
+  function getDomainPrivkey() {
+    if (accountStuff.domainPrivateJwk) { return Promise.resolve(accountStuff.domainPrivateJwk); }
+    return Keypairs.generate({
+      kty: $('input[name="kty"]:checked').value
+    , namedCurve: $('input[name="ec-crv"]:checked').value
+    , modulusLength: $('input[name="rsa-len"]:checked').value
+    }).then(function (pair) {
+      console.log('domain keypair:', pair);
+      accountStuff.domainPrivateJwk = pair.private;
+      return pair.private;
+    });
+  }
+
+  function generateCsr() {
+    var domains = ($('.js-domains').value||'example.com').split(/[, ]+/g);
+    //var privJwk = JSON.parse($('.js-jwk').innerText).private;
+    return getDomainPrivkey().then(function (privJwk) {
+      accountStuff.domainPrivateJwk = privJwk;
+      return CSR({ jwk: privJwk, domains: domains }).then(function (pem) {
+        // Verify with https://www.sslshopper.com/csr-decoder.html
+        accountStuff.csr = pem;
+        console.log('CSR:');
+        console.log(pem);
+
+        console.log('CSR info:');
+        console.log(CSR._info(pem));
+
+        return pem;
+      });
+    });
+  }
+
   window.addEventListener('load', run);
 }());