archive-gh-me/serverless
1
0
Fork 0
mirror of https://github.com/serverless/serverless.git synced 2026-01-18 14:58:43 +00:00
Code Issues Projects Releases Wiki Activity

build fixes

Browse Source
This commit is contained in:
Eslam A. Hefnawy 2018-07-25 20:11:53 +03:00
parent ef961607a0
commit 4dd3bd8ea1
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Serverless.js
View File

@ -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

2
lib/plugins/aws/deploy/lib/createStack.js
View File

@ -98,7 +98,7 @@ module.exports = {
return BbPromise.bind(this)
.then(this.create);
}
throw e;
throw new this.serverless.classes.Error(e);
});
},
};

2
lib/utils/getUser.js
View File

@ -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);
}

6
package-lock.json generated
View File

@ -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",