diff --git a/src/routes/api/index.js b/src/routes/api/index.js index bf8f110..938053a 100644 --- a/src/routes/api/index.js +++ b/src/routes/api/index.js @@ -1,5 +1,9 @@ var routes = require('express').Router(); +routes.use('/v1', require('./v1')); +routes.use('/v2', require('./v2')); +routes.use('/v3', require('./v3')); +/* //routes.use('/profiles', require('./v1/profiles')); routes.use('/applications', require('./v1/applications')); routes.use('/aeronefs', require('./v1/aeronefs')); @@ -17,7 +21,6 @@ routes.use('/products', require('./v2/products.routes')); routes.use('/profiles', require('./v2/profiles.routes')); routes.use('/tags', require('./v2/tags.routes')); - routes.use('/clans', require('./v3/clans.routes')); routes.use('/members', require('./v3/members.routes')); @@ -32,5 +35,6 @@ routes.use(function (err, req, res, next) { } return next(err); }); +*/ module.exports = routes; \ No newline at end of file diff --git a/src/routes/api/v1/index.js b/src/routes/api/v1/index.js index 8646b96..3c904f3 100644 --- a/src/routes/api/v1/index.js +++ b/src/routes/api/v1/index.js @@ -10,4 +10,16 @@ routes.use('/profiles', require('./profiles')); routes.use('/qcm', require('./qcm')); //routes.use('/user', require('./users')); +routes.use(function (err, req, res, next) { + if (err.name === 'ValidationError') { + return res.status(422).json({ + errors: Object.keys(err.errors).reduce(function (errors, key) { + errors[key] = err.errors[key].message; + return errors; + }, {}) + }); + } + return next(err); +}); + module.exports = routes; \ No newline at end of file diff --git a/src/routes/api/v2/herowars.routes.js b/src/routes/api/v2/herowars.routes.js index 4f49f43..e027e70 100644 --- a/src/routes/api/v2/herowars.routes.js +++ b/src/routes/api/v2/herowars.routes.js @@ -1,6 +1,6 @@ const express = require('express'); const { createMember, getAllMembers, getMember, updateMember } = require('../../../controllers/herowars.controller'); -const auth = require('../../auth'); +const auth = require('../../../middlewares/auth'); const herowarsRouter = express.Router(); diff --git a/src/routes/api/v2/index.js b/src/routes/api/v2/index.js index 18c701f..6d39732 100644 --- a/src/routes/api/v2/index.js +++ b/src/routes/api/v2/index.js @@ -2,10 +2,23 @@ var routes = require('express').Router(); routes.use('/user', require('./user.routes')); routes.use('/articles', require('./articles.routes')); -routes.use('/comment', require('./comment.routes')); +routes.use('/comments', require('./comments.routes')); routes.use('/product', require('./product.routes')); routes.use('/products', require('./products.routes')); -routes.use('/tag', require('./tag.routes')); +routes.use('/profiles', require('./profiles.routes')); +routes.use('/tags', require('./tags.routes')); routes.use('/herowars', require('./herowars.routes')); +routes.use(function (err, req, res, next) { + if (err.name === 'ValidationError') { + return res.status(422).json({ + errors: Object.keys(err.errors).reduce(function (errors, key) { + errors[key] = err.errors[key].message; + return errors; + }, {}) + }); + } + return next(err); +}); + module.exports = routes; \ No newline at end of file diff --git a/src/routes/api/v3/index.js b/src/routes/api/v3/index.js index 4a3e800..6e40203 100644 --- a/src/routes/api/v3/index.js +++ b/src/routes/api/v3/index.js @@ -1,6 +1,18 @@ var routes = require('express').Router(); -routes.use('/clans', require('./clans')); -routes.use('/members', require('./members')); +routes.use('/clans', require('./clans.routes')); +routes.use('/members', require('./members.routes')); + +routes.use(function (err, req, res, next) { + if (err.name === 'ValidationError') { + return res.status(422).json({ + errors: Object.keys(err.errors).reduce(function (errors, key) { + errors[key] = err.errors[key].message; + return errors; + }, {}) + }); + } + return next(err); +}); module.exports = routes; \ No newline at end of file