Skip to content

Return erroneous field and message to Frontned on error #76

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
matboehm merged 1 commit into from
Nov 5, 2019
Merged

Return erroneous field and message to Frontned on error #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions core/db.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ exports.saveEntry = function(fields, callback){
connection.query(sqlEmailExists, [data.email], function(err, results) {
if(!err) {
if(results[0]['cnt'] > 0){
callback(true);
callback({email: "Email address already exists"});
return;
}else{
let sql = "INSERT INTO entries (firstname, lastname, email, country, message, anon, ipv4, image, "
Expand Down Expand Up @@ -180,7 +180,7 @@ exports.saveEntry = function(fields, callback){
function(err, results) {
connection.release();
console.log('this.sql', this.sql); //command/query
if(err) { callback(true); return; }
if(err) { callback({error: "Internal server error"}); return; }
callback(false, results);
}
);
Expand Down
20 changes: 8 additions & 12 deletions core/entryController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ exports.createEntry = function(req, res) {
fields = {},
files = [],
errorFields = [],
out = {},
requiredFields = ['email', 'firstname', 'anon', 'message'],
allowedFields = ['email', 'firstname', 'lastname', 'anon', 'message', 'country', 'beta', 'newsletter', 'pax'];

Expand All @@ -148,6 +149,7 @@ exports.createEntry = function(req, res) {

if(value === undefined || value === ''){
errorFields.push(field);
out[field] = "Missing required field";
}
}

Expand All @@ -171,25 +173,18 @@ exports.createEntry = function(req, res) {

// TODO: ensure valid email format
if(requiredFields.length > 0 || typeError || sizeError || errorFields.length > 0){
let out = {success : false};
out ["success"] = false;
out['test'] = true;
if(hasFile){
fs.unlinkSync(files[0].path);
}

if(typeError){
out["mimeError"] = "wrong filetype "+files[0].type
out["file"] = "Wrong filetype "+files[0].type
}

if(sizeError){
out["sizeError"] = "file size exceeded max size "+form.maxFieldsSize;
}

if(requiredFields.length > 0){
out["missingFields"] = requiredFields;
}

if(errorFields.length > 0){
out["fieldErrors"] = errorFields;
out["file"] = "File size exceeded max size of "+form.maxFieldsSize;
}

res.status(400).json(out);
Expand Down Expand Up @@ -219,7 +214,8 @@ exports.createEntry = function(req, res) {

res.status(200).json({success : true});
}else{
res.status(400).json({success : false, message : "error"});
console.log(err);
res.status(400).json(Object.assign({success : false}, err));
}
});
}
Expand Down