From 4dd3bd8ea1e5a051e778a0a41e893a73e0225cd2 Mon Sep 17 00:00:00 2001
From: "Eslam A. Hefnawy" <eahefnawy@gmail.com>
Date: Wed, 25 Jul 2018 20:11:53 +0300
Subject: [PATCH] build fixes

---
 lib/Serverless.js                         | 7 +++++--
 lib/plugins/aws/deploy/lib/createStack.js | 2 +-
 lib/utils/getUser.js                      | 2 +-
 package-lock.json                         | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/Serverless.js b/lib/Serverless.js
index 5e604bb7c..28a8a89dc 100644
--- a/lib/Serverless.js
+++ b/lib/Serverless.js
@@ -127,9 +127,12 @@ class Serverless {
           throw new this.classes.Error(errorMessage);
         }
 
-        const { idToken, username } = user;
+        const listTenantsData = {
+          idToken: user.idToken,
+          username: user.username,
+        };
 
-        return platform.listTenants({ idToken, username }).then((tenants) => {
+        return platform.listTenants(listTenantsData).then((tenants) => {
           const tenantsList = tenants.map(tenant => tenant.tenantName);
           if (!tenantsList.includes(this.service.tenant)) {
             const errorMessage = [`tenant "${this.service
diff --git a/lib/plugins/aws/deploy/lib/createStack.js b/lib/plugins/aws/deploy/lib/createStack.js
index 5e8ce8d4e..4d629ed60 100644
--- a/lib/plugins/aws/deploy/lib/createStack.js
+++ b/lib/plugins/aws/deploy/lib/createStack.js
@@ -98,7 +98,7 @@ module.exports = {
           return BbPromise.bind(this)
             .then(this.create);
         }
-        throw e;
+        throw new this.serverless.classes.Error(e);
       });
   },
 };
diff --git a/lib/utils/getUser.js b/lib/utils/getUser.js
index 9a511db10..b260b7895 100644
--- a/lib/utils/getUser.js
+++ b/lib/utils/getUser.js
@@ -15,7 +15,7 @@ function getUser() {
     && globalConfig.users[currentId].dashboard) {
     user = globalConfig.users[currentId].dashboard;
   }
-  if (!user.username || !user.idToken) { // user logged out
+  if (!user || !user.username || !user.idToken) { // user logged out
     return BbPromise.resolve(null);
   }
 
diff --git a/package-lock.json b/package-lock.json
index 6bb0c0698..1dffa4456 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -446,9 +446,9 @@
       "dev": true
     },
     "aws-sdk": {
-      "version": "2.279.1",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.279.1.tgz",
-      "integrity": "sha512-2vkvg53XaTmPYW6f7YFUEHfNGzOZqKzUboaEkjz/wblmQmDS7J5DO5KTv52wsNFOICBGXgZPCblwD+oP7iT8iA==",
+      "version": "2.280.1",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.280.1.tgz",
+      "integrity": "sha512-NdATmKYTWKvRsUo7F0hhMbSVbk4kHdQb8aWSJpXRccXsOTviNSxTIOvaube8RXT7nCz+S5CckJ/fPTUTVv/vQw==",
       "requires": {
         "buffer": "4.9.1",
         "events": "1.1.1",