From 450a06aa57b1268f1c9ca9aa2beaedc5bf02ec8a Mon Sep 17 00:00:00 2001
From: Railag <whenthegroundcavedin@gmail.com>
Date: Tue, 30 Oct 2018 14:26:11 +0300
Subject: [PATCH] fixed CLI error handling

---
 src/cli/catalog.js      | 4 ++--
 src/cli/config.js       | 2 +-
 src/cli/connector.js    | 4 ++--
 src/cli/controller.js   | 4 ++--
 src/cli/diagnostics.js  | 4 ++--
 src/cli/flow.js         | 4 ++--
 src/cli/iofog.js        | 4 ++--
 src/cli/microservice.js | 4 ++--
 src/cli/registry.js     | 4 ++--
 src/cli/tunnel.js       | 4 ++--
 src/cli/user.js         | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/cli/catalog.js b/src/cli/catalog.js
index 66905dcf9..00ab2b3fa 100644
--- a/src/cli/catalog.js
+++ b/src/cli/catalog.js
@@ -127,9 +127,9 @@ const _executeCase  = async function (catalogCommand, commandName, f, isUserRequ
 
     if (isUserRequired) {
       const decoratedFunction = AuthDecorator.prepareUserById(f);
-      decoratedFunction(item);
+      await decoratedFunction(item);
     } else {
-      f(item);
+      await f(item);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/config.js b/src/cli/config.js
index 80aced562..6147b1a00 100644
--- a/src/cli/config.js
+++ b/src/cli/config.js
@@ -70,7 +70,7 @@ class Config extends BaseCLIHandler {
 const _executeCase  = async function (catalogCommand, commandName, f) {
   try {
     const item = catalogCommand[commandName];
-    f(item);
+    await f(item);
   } catch (error) {
     logger.error(error.message);
   }
diff --git a/src/cli/connector.js b/src/cli/connector.js
index ebee864ed..cdc00f0a1 100644
--- a/src/cli/connector.js
+++ b/src/cli/connector.js
@@ -71,9 +71,9 @@ async function _executeCase(commands, commandName, f, isUserRequired) {
 
     if (isUserRequired) {
       const decoratedFunction = CliDecorator.prepareUserById(f);
-      decoratedFunction(obj);
+      await decoratedFunction(obj);
     } else {
-      f(obj);
+      await f(obj);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/controller.js b/src/cli/controller.js
index 306e23a4e..8a9324312 100644
--- a/src/cli/controller.js
+++ b/src/cli/controller.js
@@ -66,9 +66,9 @@ const _executeCase = async function (userCommand, commandName, f, isUserRequired
 
     if (isUserRequired) {
       const decoratedFunction = AuthDecorator.prepareUserByEmail(f);
-      decoratedFunction(item);
+      await decoratedFunction(item);
     } else {
-      f(item);
+      await f(item);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/diagnostics.js b/src/cli/diagnostics.js
index 2fd22f815..2640d70a2 100644
--- a/src/cli/diagnostics.js
+++ b/src/cli/diagnostics.js
@@ -108,9 +108,9 @@ const _executeCase  = async function (diagnosticCommand, commandName, f, isUserR
 
     if (isUserRequired) {
       const decoratedFunction = AuthDecorator.prepareUserById(f);
-      decoratedFunction(item);
+      await decoratedFunction(item);
     } else {
-      f(item);
+      await f(item);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/flow.js b/src/cli/flow.js
index 0f8c77f00..783e87779 100644
--- a/src/cli/flow.js
+++ b/src/cli/flow.js
@@ -93,9 +93,9 @@ const _executeCase = async function (flowCommand, commandName, f, isUserRequired
 
     if (isUserRequired) {
       const decoratedFunction = AuthDecorator.prepareUserById(f);
-      decoratedFunction(item);
+      await decoratedFunction(item);
     } else {
-      f(item);
+      await f(item);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/iofog.js b/src/cli/iofog.js
index a2da148a8..7ff05df3c 100644
--- a/src/cli/iofog.js
+++ b/src/cli/iofog.js
@@ -150,9 +150,9 @@ async function _executeCase(commands, commandName, f, isUserRequired) {
 
     if (isUserRequired) {
       const decoratedFunction = CliDecorator.prepareUserById(f);
-      decoratedFunction(obj);
+      await decoratedFunction(obj);
     } else {
-      f(obj);
+      await f(obj);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/microservice.js b/src/cli/microservice.js
index f25b04718..0b9895f8d 100644
--- a/src/cli/microservice.js
+++ b/src/cli/microservice.js
@@ -260,9 +260,9 @@ const _executeCase  = async function (microserviceCommand, commandName, f, isUse
 
     if (isUserRequired) {
       const decoratedFunction = AuthDecorator.prepareUserById(f);
-      decoratedFunction(item);
+      await decoratedFunction(item);
     } else {
-      f(item);
+      await f(item);
     }
   } catch (error) {
     logger.error(error.message);
diff --git a/src/cli/registry.js b/src/cli/registry.js
index b59041f15..047e14ef5 100644
--- a/src/cli/registry.js
+++ b/src/cli/registry.js
@@ -85,9 +85,9 @@ async function _executeCase(commands, commandName, f, isUserRequired) {
 
         if (isUserRequired) {
             const decoratedFunction = CliDecorator.prepareUserById(f);
-            decoratedFunction(obj);
+            await decoratedFunction(obj);
         } else {
-            f(obj);
+            await f(obj);
         }
     } catch (error) {
         logger.error(error.message);
diff --git a/src/cli/tunnel.js b/src/cli/tunnel.js
index 8606231eb..d5b326462 100644
--- a/src/cli/tunnel.js
+++ b/src/cli/tunnel.js
@@ -87,9 +87,9 @@ async function _executeCase(commands, commandName, f, isUserRequired) {
 
         if (isUserRequired) {
             const decoratedFunction = CliDecorator.prepareUserById(f);
-            decoratedFunction(obj);
+            await decoratedFunction(obj);
         } else {
-            f(obj);
+            await f(obj);
         }
     } catch (error) {
         logger.error(error.message);
diff --git a/src/cli/user.js b/src/cli/user.js
index 063c1a891..6b6dbed29 100644
--- a/src/cli/user.js
+++ b/src/cli/user.js
@@ -99,9 +99,9 @@ const _executeCase = async function (userCommand, commandName, f, isUserRequired
 
     if (isUserRequired) {
       const decoratedFunction = AuthDecorator.prepareUserByEmail(f);
-      decoratedFunction(item);
+      await decoratedFunction(item);
     } else {
-      f(item);
+      await f(item);
     }
   } catch (error) {
     logger.error(error.message);