From 38ff3077cbbee40cafbeaa6df4b9679d1b8336ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Trevi=C3=B1o?= <danielivert@gmail.com>
Date: Tue, 11 Dec 2018 20:18:47 +0100
Subject: [PATCH] Refactor on validateAuthentication method

---
 app-cli/lib/deploy.js               | 13 +++----------
 app-cli/utils/validationsHandler.js |  4 ++++
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app-cli/lib/deploy.js b/app-cli/lib/deploy.js
index db7e58a..5b71f03 100644
--- a/app-cli/lib/deploy.js
+++ b/app-cli/lib/deploy.js
@@ -22,9 +22,6 @@ async function deployAsDefaultValues() {
     const isValidAuthentication = await validateAuthentication()
 
     if (isValidAuthentication) {
-      // REFACTOR - Refresh token in DeployApi
-      initMachineFromLocalStorage()
-
       const { appName, branchToPush, machineToDeploy } = DeployApi
 
       if (!appName || !branchToPush || !machineToDeploy) {
@@ -60,9 +57,6 @@ async function deployAsStateless(host, appName, branch, pass) {
     // Update the token to the machine that corresponds (if needed)
     MachineHelper.updateMachineAuthToken(name, newToken)
 
-    // REFACTOR - Refresh token in DeployApi
-    initMachineFromLocalStorage()
-
     if (data) {
       printMessage(
         `Starting stateless deploy to\n${host}\n${branch}\n${appName}`
@@ -207,13 +201,12 @@ async function deploy(options) {
         const isValidAuthentication = await validateAuthentication()
 
         if (isValidAuthentication) {
-          // REFACTOR - Refresh token in DeployApi
-          initMachineFromLocalStorage()
-
           deployFromGitProject()
+        } else {
+          printError("Incorrect login details", true)
         }
       } catch (e) {
-        printError("Incorrect login details", true)
+        printError(e.message, true)
       }
     }
   }
diff --git a/app-cli/utils/validationsHandler.js b/app-cli/utils/validationsHandler.js
index 95b531e..e580135 100644
--- a/app-cli/utils/validationsHandler.js
+++ b/app-cli/utils/validationsHandler.js
@@ -2,6 +2,7 @@ const fs = require("fs-extra")
 const DeployApi = require("../api/DeployApi")
 const { printError } = require("./messageHandler")
 const { requestLogin } = require("../lib/login")
+const { initMachineFromLocalStorage } = require("../utils/machineUtils")
 
 function validateIsGitRepository() {
   const gitFolderExists = fs.pathExistsSync("./.git")
@@ -89,6 +90,9 @@ async function validateAuthentication() {
   if (!isAuthenticated) {
     const loggedInStatus = await requestLogin()
 
+    // Refresh token in DeployApi
+    initMachineFromLocalStorage()
+
     return loggedInStatus
   } else {
     return Boolean(isAuthenticated)