From 52550a7dec34278c5ae488598e97c012e0d2f4bb Mon Sep 17 00:00:00 2001
From: Lemuel Marquez <lemuel@iMac-de-Lemuel.local>
Date: Tue, 5 Jan 2021 18:27:38 -0600
Subject: [PATCH] pedir tokens a medias

---
 server/config/config.js               |  2 +-
 server/middleware/autentificacion.js  | 10 ++--
 server/routes/CuestionarioAlumno.js   |  2 +-
 server/routes/CuestionarioPrograma.js |  2 +-
 server/routes/Programa.js             | 33 +++++++-----
 server/routes/Servicio.js             | 78 +++++++++++++++------------
 server/routes/Status.js               |  2 +-
 server/routes/Usuario.js              |  4 +-
 8 files changed, 75 insertions(+), 58 deletions(-)

diff --git a/server/config/config.js b/server/config/config.js
index 0c3e2f0..6632452 100644
--- a/server/config/config.js
+++ b/server/config/config.js
@@ -24,4 +24,4 @@ try {
 
 // process.env.SALT_ROUNDS = process.env.SALT_ROUNDS
 
-process.env.CADUCIDAD_TOKEN = 60 * 60 * 24 ;
+process.env.CADUCIDAD_TOKEN = 60 * 30 ;
diff --git a/server/middleware/autentificacion.js b/server/middleware/autentificacion.js
index 191f8ec..8f610d9 100644
--- a/server/middleware/autentificacion.js
+++ b/server/middleware/autentificacion.js
@@ -5,21 +5,21 @@ const verificaToken = (req, res, next) => {
   let token = req.headers.token;
 
   if (!token)
-    return res.status(401).json({
+    return res.status(400).json({
       message: 'No hay token',
     });
   jwt.verify(token, process.env.KEY, (err, decoded) => {
     if (err)
       return res.status(401).json({
-        message: 'El token ya expiro.',
+        message: err.message,
       });
-    req.idUsuario = decoded.idUsuario;
+    req.decoded = decoded;
     next();
   });
 };
 
-const crearToken = (idUsuario) => {
-  return jwt.sign({ idUsuario }, process.env.KEY, {
+const crearToken = (info) => {
+  return jwt.sign({ info }, process.env.KEY, {
     expiresIn: process.env.CADUCIDAD_TOKEN,
   });
 };
diff --git a/server/routes/CuestionarioAlumno.js b/server/routes/CuestionarioAlumno.js
index 86c3907..c022f88 100644
--- a/server/routes/CuestionarioAlumno.js
+++ b/server/routes/CuestionarioAlumno.js
@@ -4,7 +4,7 @@ const { verificaToken } = require('../middleware/autentificacion');
 const route = '/cuestionario_alumno';
 const nuevo = require('../controller/CuestionarioAlumno/nuevo');
 
-app.post(`${route}`, (req, res) => {
+app.post(`${route}`, verificaToken, (req, res) => {
   return nuevo(req.body)
     .then((data) => {
       res.status(200).json(data);
diff --git a/server/routes/CuestionarioPrograma.js b/server/routes/CuestionarioPrograma.js
index 10459b1..dffe1ed 100644
--- a/server/routes/CuestionarioPrograma.js
+++ b/server/routes/CuestionarioPrograma.js
@@ -4,7 +4,7 @@ const { verificaToken } = require('../middleware/autentificacion');
 const route = '/cuestionario_programa';
 const nuevo = require('../controller/CuestionarioPrograma/nuevo');
 
-app.post(`${route}`, (req, res) => {
+app.post(`${route}`, verificaToken, (req, res) => {
   return nuevo(req.body)
     .then((data) => {
       res.status(200).json(data);
diff --git a/server/routes/Programa.js b/server/routes/Programa.js
index 62ebbf1..33fcd4c 100644
--- a/server/routes/Programa.js
+++ b/server/routes/Programa.js
@@ -7,7 +7,7 @@ const route = '/programa';
 const get = require('../controller/Programa/get');
 const cargaMasiva = require('../controller/Programa/cargaMasiva');
 
-app.get(`${route}`, (req, res) => {
+app.get(`${route}`, verificaToken, (req, res) => {
   return get(req.query)
     .then((data) => {
       res.status(200).json(data);
@@ -17,19 +17,24 @@ app.get(`${route}`, (req, res) => {
     });
 });
 
-app.post(`${route}/carga_masiva`, upload.single('csv'), (req, res) => {
-  if (req.file) {
-    return cargaMasiva(req.file.filename)
-      .then((data) => {
-        res.status(201).json(data);
-      })
-      .catch((err) => {
-        res.status(400).json({ message: err.message });
-      });
+app.post(
+  `${route}/carga_masiva`,
+  // verificaToken,
+  upload.single('csv'),
+  (req, res) => {
+    if (req.file) {
+      return cargaMasiva(req.file.filename)
+        .then((data) => {
+          res.status(201).json(data);
+        })
+        .catch((err) => {
+          res.status(400).json({ message: err.message });
+        });
+    }
+    res
+      .status(400)
+      .json({ message: 'No se envio un archivo csv para la carga masiva.' });
   }
-  res
-    .status(400)
-    .json({ message: 'No se envio un archivo csv para la carga masiva.' });
-});
+);
 
 module.exports = app;
diff --git a/server/routes/Servicio.js b/server/routes/Servicio.js
index 460e45e..1091ea9 100644
--- a/server/routes/Servicio.js
+++ b/server/routes/Servicio.js
@@ -21,19 +21,24 @@ const rechazarAceptacion = require('../controller/Servicio/rechazarAceptacion');
 const rechazarTermino = require('../controller/Servicio/rechazarTermino');
 const rechazarInforme = require('../controller/Servicio/rechazarInforme');
 
-app.post(`${route}/nuevo`, upload.single('cartaAceptacion'), (req, res) => {
-  return nuevo(JSON.parse(req.body.alumno), req.file.filename)
-    .then((data) => {
-      res.status(201).json(data);
-    })
-    .catch((err) => {
-      if (req.file.filename)
-        fs.unlinkSync(`./server/uploads/${req.file.filename}`);
-      res.status(400).json({ message: err.message });
-    });
-});
+app.post(
+  `${route}/nuevo`,
+  // verificaToken,
+  upload.single('cartaAceptacion'),
+  (req, res) => {
+    return nuevo(JSON.parse(req.body.alumno), req.file.filename)
+      .then((data) => {
+        res.status(201).json(data);
+      })
+      .catch((err) => {
+        if (req.file.filename)
+          fs.unlinkSync(`./server/uploads/${req.file.filename}`);
+        res.status(400).json({ message: err.message });
+      });
+  }
+);
 
-app.get(`${route}/servicios_admin`, (req, res) => {
+app.get(`${route}/servicios_admin`, verificaToken, (req, res) => {
   return serviciosAdmin(req.query)
     .then((data) => {
       res.status(200).json(data);
@@ -43,7 +48,7 @@ app.get(`${route}/servicios_admin`, (req, res) => {
     });
 });
 
-app.get(`${route}/servicios_responsable`, (req, res) => {
+app.get(`${route}/servicios_responsable`, verificaToken, (req, res) => {
   return serviciosResponsable(req.query)
     .then((data) => {
       res.status(200).json(data);
@@ -53,7 +58,7 @@ app.get(`${route}/servicios_responsable`, (req, res) => {
     });
 });
 
-app.get(`${route}/admin`, (req, res) => {
+app.get(`${route}/admin`, verificaToken, (req, res) => {
   return admin(req.query)
     .then((data) => {
       res.status(200).json(data);
@@ -63,7 +68,7 @@ app.get(`${route}/admin`, (req, res) => {
     });
 });
 
-app.get(`${route}/alumno`, (req, res) => {
+app.get(`${route}/alumno`, verificaToken, (req, res) => {
   return alumno(req.query)
     .then((data) => {
       res.status(200).json(data);
@@ -73,7 +78,7 @@ app.get(`${route}/alumno`, (req, res) => {
     });
 });
 
-app.put(`${route}/cancelar`, (req, res) => {
+app.put(`${route}/cancelar`, verificaToken, (req, res) => {
   return cancelar(req.body)
     .then((data) => {
       res.status(200).json(data);
@@ -83,7 +88,7 @@ app.put(`${route}/cancelar`, (req, res) => {
     });
 });
 
-app.put(`${route}/registro`, (req, res) => {
+app.put(`${route}/registro`, verificaToken, (req, res) => {
   return registro(req.body)
     .then((data) => {
       res.status(200).json(data);
@@ -93,7 +98,7 @@ app.put(`${route}/registro`, (req, res) => {
     });
 });
 
-app.put(`${route}/registro_validado`, (req, res) => {
+app.put(`${route}/registro_validado`, verificaToken, (req, res) => {
   return registroValidado(req.body)
     .then((data) => {
       res.status(200).json(data);
@@ -105,6 +110,7 @@ app.put(`${route}/registro_validado`, (req, res) => {
 
 app.put(
   `${route}/carta_aceptacion`,
+  // verificaToken,
   upload.single('cartaAceptacion'),
   (req, res) => {
     return cartaAceptacion(JSON.parse(req.body.data), req.file.filename)
@@ -119,20 +125,26 @@ app.put(
   }
 );
 
-app.put(`${route}/carta_termino`, upload.single('cartaTermino'), (req, res) => {
-  return cartaTermino(JSON.parse(req.body.data), req.file.filename)
-    .then((data) => {
-      res.status(200).json(data);
-    })
-    .catch((err) => {
-      if (req.file.filename)
-        fs.unlinkSync(`./server/uploads/${req.file.filename}`);
-      res.status(400).json({ message: err.message });
-    });
-});
+app.put(
+  `${route}/carta_termino`,
+  // verificaToken,
+  upload.single('cartaTermino'),
+  (req, res) => {
+    return cartaTermino(JSON.parse(req.body.data), req.file.filename)
+      .then((data) => {
+        res.status(200).json(data);
+      })
+      .catch((err) => {
+        if (req.file.filename)
+          fs.unlinkSync(`./server/uploads/${req.file.filename}`);
+        res.status(400).json({ message: err.message });
+      });
+  }
+);
 
 app.put(
   `${route}/informe_global`,
+  // verificaToken,
   upload.single('informeGlobal'),
   (req, res) => {
     return informeGlobal(JSON.parse(req.body.data), req.file.filename)
@@ -147,7 +159,7 @@ app.put(
   }
 );
 
-app.put(`${route}/liberacion`, (req, res) => {
+app.put(`${route}/liberacion`, verificaToken, (req, res) => {
   return liberacion(req.body)
     .then((data) => {
       res.status(200).json(data);
@@ -157,7 +169,7 @@ app.put(`${route}/liberacion`, (req, res) => {
     });
 });
 
-app.put(`${route}/rechazar_aceptacion`, (req, res) => {
+app.put(`${route}/rechazar_aceptacion`, verificaToken, (req, res) => {
   return rechazarAceptacion(req.body)
     .then((data) => {
       res.status(200).json(data);
@@ -167,7 +179,7 @@ app.put(`${route}/rechazar_aceptacion`, (req, res) => {
     });
 });
 
-app.put(`${route}/rechazar_termino`, (req, res) => {
+app.put(`${route}/rechazar_termino`, verificaToken, (req, res) => {
   return rechazarTermino(req.body)
     .then((data) => {
       res.status(200).json(data);
@@ -177,7 +189,7 @@ app.put(`${route}/rechazar_termino`, (req, res) => {
     });
 });
 
-app.put(`${route}/rechazar_informe`, (req, res) => {
+app.put(`${route}/rechazar_informe`, verificaToken, (req, res) => {
   return rechazarInforme(req.body)
     .then((data) => {
       res.status(200).json(data);
diff --git a/server/routes/Status.js b/server/routes/Status.js
index 58531a0..e3f50b5 100644
--- a/server/routes/Status.js
+++ b/server/routes/Status.js
@@ -4,7 +4,7 @@ const { verificaToken } = require('../middleware/autentificacion');
 const route = '/status';
 const get = require('../controller/Status/get');
 
-app.get(`${route}`, (req, res) => {
+app.get(`${route}`, verificaToken, (req, res) => {
   return get()
     .then((data) => {
       res.status(200).json(data);
diff --git a/server/routes/Usuario.js b/server/routes/Usuario.js
index 9b8efaf..c1596f3 100644
--- a/server/routes/Usuario.js
+++ b/server/routes/Usuario.js
@@ -16,7 +16,7 @@ app.post(`${route}/login`, (req, res) => {
     });
 });
 
-app.get(`${route}/escolares`, (req, res) => {
+app.get(`${route}/escolares`, verificaToken, (req, res) => {
   return escolares(req.query)
     .then((data) => {
       res.status(200).json(data);
@@ -26,7 +26,7 @@ app.get(`${route}/escolares`, (req, res) => {
     });
 });
 
-app.get(`${route}/responsable`, (req, res) => {
+app.get(`${route}/responsable`, verificaToken, (req, res) => {
   return responsable(req.query)
     .then((data) => {
       res.status(200).json(data);