From a0927bd2654a9ca2ed2ff1014e086813319006ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Trevi=C3=B1o?= <danielivert@gmail.com>
Date: Fri, 14 Dec 2018 16:04:50 +0100
Subject: [PATCH] Refactor inquirer promt to use async/await

---
 app-cli/lib/logout.js      | 17 +++++++----------
 app-cli/lib/serversetup.js | 28 +++++++++++++---------------
 2 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/app-cli/lib/logout.js b/app-cli/lib/logout.js
index 4e52b31..4301af9 100644
--- a/app-cli/lib/logout.js
+++ b/app-cli/lib/logout.js
@@ -22,22 +22,19 @@ function generateQuestions() {
   ]
 }
 
-function logout() {
+async function logout() {
   const questions = generateQuestions()
 
   printMessage("Logout from a Captain Machine and clear auth info")
 
-  inquirer.prompt(questions).then(answers => {
-    const { captainNameToLogout } = answers
+  const answers = await inquirer.prompt(questions)
+  const { captainNameToLogout } = answers
 
-    if (!captainNameToLogout) {
-      printMessage("\nOperation cancelled by the user...\n")
+  if (!captainNameToLogout) {
+    printMessage("\nOperation cancelled by the user...\n", true)
+  }
 
-      return
-    }
-
-    MachineHelper.logoutMachine(captainNameToLogout)
-  })
+  MachineHelper.logoutMachine(captainNameToLogout)
 }
 
 module.exports = logout
diff --git a/app-cli/lib/serversetup.js b/app-cli/lib/serversetup.js
index f7596b8..3164084 100644
--- a/app-cli/lib/serversetup.js
+++ b/app-cli/lib/serversetup.js
@@ -216,26 +216,24 @@ const questions = [
   }
 ]
 
-function serversetup() {
+async function serversetup() {
   printMessage("\nSetup your Captain server\n")
 
-  inquirer.prompt(questions).then(answers => {
-    var captainAddress = `https://${SystemApi.customDomainFromUser}`
+  const answers = await inquirer.prompt(questions)
+  const captainAddress = `https://${SystemApi.customDomainFromUser}`
+  const newMachine = {
+    authToken: LoginApi.token,
+    baseUrl: captainAddress,
+    name: answers.captainName
+  }
 
-    const newMachine = {
-      authToken: LoginApi.token,
-      baseUrl: captainAddress,
-      name: answers.captainName
-    }
+  MachineHelper.addMachine(newMachine)
 
-    MachineHelper.addMachine(newMachine)
+  printMessage(`\n\nCaptain is available at ${captainAddress}`)
 
-    printMessage(`\n\nCaptain is available at ${captainAddress}`)
-
-    printMessage(
-      "\nFor more details and docs see http://www.captainduckduck.com\n\n"
-    )
-  })
+  printMessage(
+    "\nFor more details and docs see http://www.captainduckduck.com\n\n"
+  )
 }
 
 module.exports = serversetup