added error code to utils functions

Author: mutazen

api/controllers/auth.controller.js

@@ -10,31 +10,29 @@ exports.login = (req, res) => {
       if (user) {
         bcrypt.compare(req.body.password, user.password, (err, result) => {
           if (!result) {
-            console.log(req.body)
-            return res.json({ error: 'Wrong email or password' })
+            console.log(err)
+            return res.status(403).json({ error: 'Wrong email or password' })
           }
           const user_data = { rol: user.rol, email: user.email }
           const token = jwt.sign(
             user_data,
             process.env.SECRET, // TODO SECRET MORE SECRET PLEASE
             { expiresIn: '1h' }
-            )
-            console.log(token, user_data)
-            return res.json({ token: token, ...user_data })
+          )
+          return res.status(200).json({ token: token, ...user_data })
         })
       } else {
-        return res.json({ error: 'Wrong email or password' })
+        return res.status(403).json({ error: 'Wrong email or password' })
       }
     })
     .catch(err => {
       console.log(err)
-      res.json({ err: 'Error' })
+      res.status(500).json({ err: 'Error' })
     })
 }
 
 exports.whoami = (req, res) => {
-  console.log(req.body.user)
-  res.json({
+  res.status(200).json({
     firstName: req.body.user.firstName,
     lastName: req.body.user.lastName,
     rol: req.body.user.rol,

api/controllers/incidenceCategories.controller.js

@@ -22,12 +22,12 @@ exports.getIncidenceCategories = (req, res) => {
 
 exports.updateIncidenceCategory = (req, res) => {
   incidenceCategoriesModel
-    .findByIdAndUpdate(req.body.id, { name: req.body.name })
+    .findByIdAndUpdate(req.params.idIncidenceCategory, { name: req.body.name })
     .then(incidenceCategory => {
       if (incidenceCategory) {
         res.status(200).json({ msg: `The incidence category '${req.body.name}' has been updated!` })
       } else {
-        res.status(400).json({ msg: 'Category incidence not found' })
+        res.status(404).json({ msg: 'Category incidence not found' })
       }
     })
     .catch(err => {

api/routes/incidenceCategories.router.js

@@ -10,7 +10,7 @@ const {
 
 incidenceCategoriesRouter.post('/', checkAuth, checkManager, addIncidenceCategory)
 incidenceCategoriesRouter.get('/', checkAuth, checkCustomerServiceOrManager, getIncidenceCategories)
-incidenceCategoriesRouter.put('/', checkAuth, checkManager, updateIncidenceCategory)
+incidenceCategoriesRouter.put('/:idIncidenceCategory', checkAuth, checkManager, updateIncidenceCategory)
 incidenceCategoriesRouter.delete('/', checkAuth, checkManager, deleteIncidenceCategory)
 
 exports.incidenceCategoriesRouter = incidenceCategoriesRouter

utils/index.js

@@ -16,7 +16,7 @@ exports.checkAuth = (req, res, next) => {
           req.body.token = token
           next()
         } else {
-          res.json({ err: 'Token not valid' })
+          res.status(500).json({ err: 'Token not valid' })
         }
       })
   })
@@ -30,7 +30,7 @@ exports.checkManager = (req, res, next) => {
         req.body.user = user
         next()
       } else {
-        res.json({ err: 'Token not valid' })
+        res.status(500).json({ err: 'Token not valid' })
       }
     })
 }
@@ -43,7 +43,7 @@ exports.checkTechnician = (req, res, next) => {
         res.locals.user = user
         next()
       } else {
-        res.json({ err: 'Token not valid' })
+        res.status(500).json({ err: 'Token not valid' })
       }
     })
 }
@@ -56,7 +56,7 @@ exports.checkCustomerService = (req, res, next) => {
         res.locals.user = user
         next()
       } else {
-        res.json({ err: 'Token not valid' })
+        res.status(500).json({ err: 'Token not valid' })
       }
     })
 }
@@ -69,7 +69,7 @@ exports.checkCustomerServiceOrManager = (req, res, next) => {
         res.locals.user = user
         next()
       } else {
-        res.json({ err: 'Token not valid' })
+        res.status(500).json({ err: 'Token not valid' })
       }
     })
 }