Merge pull request #52 from topcoder-platform/develop

bring master up to date

Author: Dushyant Bhalgami

app-bootstrap.js

@@ -6,13 +6,5 @@ const Joi = require('joi')
 
 Joi.optionalId = () => Joi.string()
 Joi.id = () => Joi.optionalId().required()
-Joi.page = () =>
-  Joi.number()
-    .integer()
-    .min(1)
-    .default(1)
-Joi.perPage = () =>
-  Joi.number()
-    .integer()
-    .min(1)
-    .default(20)
+Joi.page = () => Joi.number().integer().min(1).default(1)
+Joi.perPage = () => Joi.number().integer().min(1).default(20)

app-routes.js

@@ -13,12 +13,12 @@ const authenticator = require('tc-core-library-js').middleware.jwtAuthenticator
  * Configure all routes for express app
  * @param app the express app
  */
-module.exports = app => {
+module.exports = (app) => {
   // Load all routes
   _.each(routes, (verbs, path) => {
     _.each(verbs, (def, verb) => {
       const controllerPath = `./src/controllers/${def.controller}`
-      const method = require(controllerPath)[def.method]; // eslint-disable-line
+      const method = require(controllerPath)[def.method] // eslint-disable-line
       if (!method) {
         throw new Error(`${def.method} is undefined`)
       }
@@ -32,25 +32,14 @@ module.exports = app => {
       // add Authenticator check if route has auth
       if (def.auth) {
         actions.push((req, res, next) => {
-          authenticator(_.pick(config, ['AUTH_SECRET', 'VALID_ISSUERS']))(
-            req,
-            res,
-            next
-          )
+          authenticator(_.pick(config, ['AUTH_SECRET', 'VALID_ISSUERS']))(req, res, next)
         })
 
         actions.push((req, res, next) => {
           if (req.authUser.isMachine) {
             // M2M
-            if (
-              !req.authUser.scopes ||
-              !helper.checkIfExists(def.scopes, req.authUser.scopes)
-            ) {
-              next(
-                new errors.ForbiddenError(
-                  'You are not allowed to perform this action!'
-                )
-              )
+            if (!req.authUser.scopes || !helper.checkIfExists(def.scopes, req.authUser.scopes)) {
+              next(new errors.ForbiddenError('You are not allowed to perform this action!'))
             } else {
               next()
             }
@@ -59,20 +48,12 @@ module.exports = app => {
             // User
             if (req.authUser.roles) {
               if (!helper.checkIfExists(def.access, req.authUser.roles)) {
-                next(
-                  new errors.ForbiddenError(
-                    'You are not allowed to perform this action!'
-                  )
-                )
+                next(new errors.ForbiddenError('You are not allowed to perform this action!'))
               } else {
                 next()
               }
             } else {
-              next(
-                new errors.ForbiddenError(
-                  'You are not authorized to perform this action'
-                )
-              )
+              next(new errors.ForbiddenError('You are not authorized to perform this action'))
             }
           }
         })
@@ -87,13 +68,9 @@ module.exports = app => {
   app.use('*', (req, res) => {
     const route = routes[req.baseUrl]
     if (route) {
-      res
-        .status(HttpStatus.METHOD_NOT_ALLOWED)
-        .json({ message: 'The requested HTTP method is not supported.' })
+      res.status(HttpStatus.METHOD_NOT_ALLOWED).json({ message: 'The requested HTTP method is not supported.' })
     } else {
-      res
-        .status(HttpStatus.NOT_FOUND)
-        .json({ message: 'The requested resource cannot be found.' })
+      res.status(HttpStatus.NOT_FOUND).json({ message: 'The requested resource cannot be found.' })
     }
   })
 }

app.js

@@ -40,13 +40,11 @@ require('./app-routes')(app)
 app.use((err, req, res, next) => {
   logger.logFullError(err, req.signature || `${req.method} ${req.url}`)
   const errorResponse = {}
-  const status = err.isJoi
-    ? HttpStatus.BAD_REQUEST
-    : err.httpStatus || HttpStatus.INTERNAL_SERVER_ERROR
+  const status = err.isJoi ? HttpStatus.BAD_REQUEST : err.httpStatus || HttpStatus.INTERNAL_SERVER_ERROR
 
   if (_.isArray(err.details)) {
     if (err.isJoi) {
-      _.map(err.details, e => {
+      _.map(err.details, (e) => {
         if (e.message) {
           if (_.isUndefined(errorResponse.message)) {
             errorResponse.message = e.message