proper Joi validation that matches swagger schema

Author: thkang2

Backend/README.md

@@ -146,12 +146,7 @@ Following variables can be configured:
         ]
 
 
-- to schedule a mail to be sent in the future, set `delivery_time`, use ISOString or UTCString format.
-
-        "delivery_time": "Mon, 30 May 2016 15:57:25 GMT" or "2016-06-02T21:31:22.145Z"
-
-
-- in javascript, very easy to format to above timestamp, natively supported in javascript by `date#toUTCString()` method
+- to schedule a mail to be sent in the future, set `delivery_time` in ISO 8601 date format.
 - for attachments, `content_bytes` should be string in base64 of original binary data.
 
         "attachments": [{

Backend/src/app.js

@@ -18,6 +18,7 @@ const morgan = require('morgan');
 const bodyParser = require('body-parser');
 const passport = require('passport');
 const logger = require('./common/logger');
+const _ = require('lodash');
 
 app.use(cors());
 app.use(bodyParser.json());
@@ -33,15 +34,26 @@ app.use(passport.initialize());
 // eslint-disable-next-line no-unused-vars
 app.use((err, req, res, next) => {
   logger.logFullError(err, req.signature || `${req.method} ${req.url}`);
-  let status = err.httpStatus || 500;
-  if (err.isJoi) {
-    status = 400;
+  const errorResponse = {};
+  const status = (err.isJoi) ? 400 : err.httpStatus || 500;
+
+  if (_.isArray(err.details)) {
+    errorResponse.fields = _.map(err.details, 'path').join(', ');
+    _.map(err.details, (e) => {
+      if (e.message) {
+        if (_.isUndefined(errorResponse.message)) {
+          errorResponse.message = e.message;
+        } else {
+          errorResponse.message += ', ' + e.message;
+        }
+      }
+    });
+  }
+  if (_.isUndefined(errorResponse.message)) {
+    errorResponse.message = 'server error';
   }
-  res.status(status).json({
-    code: String(status),
-    message: err.details && err.details[0] && err.details[0].message ?
-    err.details[0].message : (err.message || 'Server error')
-  });
+  errorResponse.code = status;
+  res.status(status).json(errorResponse);
 });
 
 const port = config.port;

Backend/src/common/logger.js

@@ -118,7 +118,15 @@ logger.decorateWithValidators = function decorateWithValidators(service) {
     service[name] = function* serviceMethodWithValidation() {
       const args = Array.prototype.slice.call(arguments);
       const value = _combineObject(params, args);
-      const normalized = Joi.attempt(value, method.schema);
+      const normalized = yield new Promise((resolve) => {
+        Joi.validate(value, method.schema, { abortEarly: false }, (err, val) => {
+          if (err) {
+            throw err;
+          } else {
+            resolve(val);
+          }
+        });
+      });
       const newArgs = [];
       // Joi will normalize values
       // for example string number '1' to 1

Backend/src/modules/mail/services/MailService.js

@@ -19,27 +19,27 @@ const CRUDService = require('../../crud/services/CRUDService');
 const attachment = Joi.object().keys({
   file_name: Joi.string().required(),
   file_type: Joi.string().required(),
-  content_bytes: Joi.string().required()
+  content_bytes: Joi.binary().encoding('base64').required()
 });
 
 const image = Joi.object().keys({
   name: Joi.string().required(),
   type: Joi.string().required(),
-  content_bytes: Joi.string().required()
+  content_bytes: Joi.binary().encoding('base64').required()
 });
 
 const emailSchema = Joi.object().keys({
-  sender: Joi.string().required(),
-  recipients: Joi.array().items(Joi.string()).required(),
-  cc_recipients: Joi.array().items(Joi.string()),
-  bcc_recipients: Joi.array().items(Joi.string()),
+  sender: Joi.string().email().required(),
+  recipients: Joi.array().items(Joi.string().email()).required(),
+  cc_recipients: Joi.array().items(Joi.string().email()),
+  bcc_recipients: Joi.array().items(Joi.string().email()),
   subject: Joi.string(),
   html_body: Joi.string(),
   text_body: Joi.string(),
   attachments: Joi.array().items(attachment),
   images: Joi.array().items(image),
-  headers: Joi.array().items(Joi.string()),
-  delivery_time: Joi.string() // in format of ISOString or UTCString
+  headers: Joi.array().items(Joi.string().regex(/^([^:]+?):(.+)$/)),
+  delivery_time: Joi.date().iso() // ISO 8601 date format.
 });
 
 /**
@@ -75,7 +75,7 @@ function* sendMail(email) {
    }
    headers should be in "headerName:headerValue" format
    attachment content_bytes should be base64 encoded.
-   delivery_time in format of ISOString or UTCString.
+   delivery_time in format of ISO 8601 date format
    */
 
   /** @type {Object} data  data to be sent to mailgun API */
@@ -226,7 +226,7 @@ function* getMailStatus(id) {
         resolve({
           delivered: true,
           // because mailgun returns unix timestamp in seconds for delivery_time
-          delivery_time: new Date(deliverEvent.timestamp * 1000).toUTCString()
+          delivery_time: new Date(deliverEvent.timestamp * 1000).toISOString()
         });
       } else {
         // not yet delivered