Merge pull request #190 from hackmcgill/bugfix/errorResponses

Fix how we send back errors so that the format is more consistent

Author: YiFeiZhang2

app.js

@@ -95,7 +95,16 @@ app.use((err, req, res, next) => {
     const status = (err.status) ? err.status : 500;
     const message = (err.message) ? err.message : "Internal Server Error";
     //Only show bad error when we're not in deployment
-    const errorContents = (err.error) ? err.error : (process.env.NODE_ENV !== "deployment") ? err : {};
+    let errorContents;
+    if (status === 500 && Services.env.isProduction) {
+        errorContents = {};
+    } else if (err.error) {
+        errorContents = err.error;
+    } else if (err.data) {
+        errorContents = err.data;
+    } else {
+        errorContents = err;
+    }
     res.status(status).json({
         message: message,
         data: errorContents

tests/search.service.spec.js

@@ -67,7 +67,7 @@ describe("Searching for hackers", function () {
             })
             .end(function (err, res) {
                 res.should.have.status(422);
-                res.body.data.data.model.msg.should.equal("Must be a valid searchable model");
+                res.body.data.model.msg.should.equal("Must be a valid searchable model");
                 done();
             });
     })
@@ -79,7 +79,7 @@ describe("Searching for hackers", function () {
             })
             .end(function (err, res) {
                 res.should.have.status(422);
-                res.body.data.data.model.msg.should.equal("Model must be lower case");
+                res.body.data.model.msg.should.equal("Model must be lower case");
                 done();
             })
     })
@@ -91,7 +91,7 @@ describe("Searching for hackers", function () {
             })
             .end(function (err, res) {
                 res.should.have.status(422);
-                res.body.data.data.model.msg.should.equal("Must be a valid searchable model");
+                res.body.data.model.msg.should.equal("Must be a valid searchable model");
                 done();
             })
     })