Skip to content

fix aws file upload error handling #237

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

Open
gregorio-michael wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix aws file upload error handling #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31b966f
fix aws file upload error handling
Sep 14, 2017
0cc388a
add missing lodash module
Oct 6, 2017
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
2 changes: 1 addition & 1 deletion index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ function cms(loopbackApplication, options) {

aws.getS3Credentials(req.query["path"], req.query["fileType"], function(error, credentials) {
if (error) {
res.status(500).send(error);
res.status(error.status).send(error.message);
}
res.send(credentials);
});
Expand Down
17 changes: 14 additions & 3 deletions server/aws.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
THE SOFTWARE.
*/

var _ = require('lodash');
var uuid = require('node-uuid');
var moment = require("moment");
var crypto = require("crypto");
Expand All @@ -38,16 +39,26 @@ var awsConfig;
function getS3Credentials(path, fileType, callback) {
var acceptableFileTypes = awsConfig.s3.path[path];
if (!acceptableFileTypes) {
callback({error: "Invalid path value"});
var error = new Error('Invalid path value');
var error.status = 400;
callback(error);
return;
}
if (fileType == undefined || fileType == null) {
callback({error: "Please provide a fileType"});
var error = new Error('Please provide a fileType');
var error.status = 400;
callback(error);
return;
}
var fileExtension = acceptableFileTypes[fileType];
if (!fileExtension) {
callback({error: "Invalid fileType for path"});
var files = [];
_.forEach(acceptableFileTypes, function(type) {
files.push(type);
});
var error = new Error('The file being uploaded is not an accepted file type for this form. Allowed file types are (' + files.join(', ') + ').');
error.status = 400;
callback(error);
return;
}
var expirationLength = 900; //15min
Expand Down