Skip to content

Fix depedency error #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 22, 2018
Merged

Fix depedency error #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c6fe37
fixed the error reporting for our wrapper
roaringdev Jun 22, 2018
159729a
Merge branch 'development' of github.com:LeoPlatform/Nodejs into deve…
roaringdev Jun 22, 2018
ece839f
upgraded mocha to remove depenecy warning
roaringdev Jun 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
183 changes: 50 additions & 133 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"leo-config": "^1.0.3"
},
"devDependencies": {
"mocha": "^3.5.3"
"mocha": "^5.2.0"
},
"author": "LEO Enterprises <dev@leoplatform.io> (http://leoplatform.io)",
"repository": "LeoPlatform/Nodejs",
Expand Down
5 changes: 4 additions & 1 deletion wrappers/resource.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ module.exports = function(configOverride, botHandler) {
body: err.toString()
});
} else if (err) {
console.log(err);
callback(null, {
statusCode: 500,
headers: {
Expand Down Expand Up @@ -99,13 +100,15 @@ module.exports = function(configOverride, botHandler) {
body: err.toString()
});
} else if (err) {
console.log(err);
callback(null, {
statusCode: 500,
headers: {
'Content-Type': config.ErrorContentType || 'text/html',
"Access-Control-Allow-Origin": config.cors ? config.cors : undefined
},
body: err.toString()
//we caught an error they didn't send us, don't reveal it here
body: "Unexpected Server Error"
});
}
});
Expand Down