fix(ssl): ensure ssl setup works using the --sslemail flag

closes #283
- cleanup promise handling in ssl setup

Author: acburdine

extensions/nginx/index.js

@@ -132,17 +132,23 @@ class NginxExtension extends cli.Extension {
         }, {
             title: 'Preparing nginx for SSL configuration',
             task: (ctx) => {
-                return argv.sslemail ? Promise.resolve({email: argv.sslemail}) : this.ui.prompt({
-                    name: 'email',
-                    type: 'input',
-                    message: 'Enter your email (used for SSL certificate generation)',
-                    validate: value => Boolean(value) || 'You must supply an email'
-                }).then((answer) => {
-                    argv.sslemail = answer.email;
+                let promise;
+
+                if (argv.sslemail) {
+                    promise = Promise.resolve(argv.sslemail);
+                } else {
+                    promise = this.ui.prompt({
+                        name: 'email',
+                        type: 'input',
+                        message: 'Enter your email (used for SSL certificate generation)',
+                        validate: value => Boolean(value) || 'You must supply an email'
+                    }).then(answer => { argv.sslemail = answer.email; });
+                }
 
-                    ctx.ssl = {};
+                return promise.then(() => {
+                    return Promise.fromCallback((cb) => NginxConfFile.create(nginxConfPath, cb)).then((conf) => {
+                        ctx.ssl = {};
 
-                    return Promise.fromNode((cb) => NginxConfFile.create(nginxConfPath, cb)).then((conf) => {
                         ctx.ssl.conf = conf;
                         ctx.ssl.http = conf.nginx.server;
                         ctx.ssl.http._add('location', '~ /.well-known');