From 339001c6e6c8270af34314d81aeff61a990b37d2 Mon Sep 17 00:00:00 2001
From: xXpuma99Xx <51341582+xXpuma99Xx@users.noreply.github.com>
Date: Sun, 2 Jan 2022 18:36:46 -0600
Subject: [PATCH] validacion basica str

---
 server/controller/CasoEspecial/nuevo.js       | 7 ++++++-
 server/controller/Servicio/cartaAceptacion.js | 7 ++++++-
 server/controller/Servicio/cartaTermino.js    | 7 ++++++-
 server/controller/Servicio/informeGlobal.js   | 7 ++++++-
 server/controller/Servicio/nuevo.js           | 7 ++++++-
 server/controller/Usuario/login.js            | 7 ++++++-
 server/controller/Usuario/responsables.js     | 2 +-
 server/helper/validar.js                      | 1 -
 8 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/server/controller/CasoEspecial/nuevo.js b/server/controller/CasoEspecial/nuevo.js
index 2cec202..822c4c5 100644
--- a/server/controller/CasoEspecial/nuevo.js
+++ b/server/controller/CasoEspecial/nuevo.js
@@ -40,8 +40,13 @@ const nuevo = async (body, file) => {
   const motivo = body.motivo
     ? validar.validarNumero(body.motivo, 'motivo', true, 1)
     : '';
+  const path = `./server/uploads/${validar.validacionBasicaStr(
+    file,
+    'archivo',
+    true,
+    1000
+  )}`;
   let carpeta = '';
-  const path = `./server/uploads/${validar.validar(file, 'El archivo', 1000)}`;
 
   return Usuario.findOne({
     where: { idUsuario },
diff --git a/server/controller/Servicio/cartaAceptacion.js b/server/controller/Servicio/cartaAceptacion.js
index 1015ba1..01e6b7b 100644
--- a/server/controller/Servicio/cartaAceptacion.js
+++ b/server/controller/Servicio/cartaAceptacion.js
@@ -8,7 +8,12 @@ const cartaTermino = async (body, file) => {
     body.idServicio,
     'id servicio'
   );
-  const path = `./server/uploads/${validar.validar(file, 'El archivo', 1000)}`;
+  const path = `./server/uploads/${validar.validacionBasicaStr(
+    file,
+    'archivo',
+    true,
+    1000
+  )}`;
 
   return Servicio.findOne({
     where: { idServicio },
diff --git a/server/controller/Servicio/cartaTermino.js b/server/controller/Servicio/cartaTermino.js
index 93088df..6153f0c 100644
--- a/server/controller/Servicio/cartaTermino.js
+++ b/server/controller/Servicio/cartaTermino.js
@@ -8,7 +8,12 @@ const cartaTermino = async (body, file) => {
     body.idServicio,
     'id servicio'
   );
-  const path = `./server/uploads/${validar.validar(file, 'El archivo', 1000)}`;
+  const path = `./server/uploads/${validar.validacionBasicaStr(
+    file,
+    'archivo',
+    true,
+    1000
+  )}`;
 
   return Servicio.findOne({
     where: { idServicio },
diff --git a/server/controller/Servicio/informeGlobal.js b/server/controller/Servicio/informeGlobal.js
index 15e22e9..7d7d158 100644
--- a/server/controller/Servicio/informeGlobal.js
+++ b/server/controller/Servicio/informeGlobal.js
@@ -8,7 +8,12 @@ const informeGlobal = async (body, file) => {
     body.idServicio,
     'id servicio'
   );
-  const path = `./server/uploads/${validar.validar(file, 'El archivo', 1000)}`;
+  const path = `./server/uploads/${validar.validacionBasicaStr(
+    file,
+    'archivo',
+    true,
+    1000
+  )}`;
 
   return Servicio.findOne({
     where: { idServicio },
diff --git a/server/controller/Servicio/nuevo.js b/server/controller/Servicio/nuevo.js
index dd6d071..69d9deb 100644
--- a/server/controller/Servicio/nuevo.js
+++ b/server/controller/Servicio/nuevo.js
@@ -24,7 +24,12 @@ const nuevo = async (body, file) => {
     false
   );
   const fechaFin = validar.validarFecha(body.fechaFin, 'fecha fin', false);
-  const path = `./server/uploads/${validar.validar(file, 'El archivo', 1000)}`;
+  const path = `./server/uploads/${validar.validacionBasicaStr(
+    file,
+    'archivo',
+    true,
+    1000
+  )}`;
   const programaInterno = body.programaInterno
     ? validar.validarAlfanumerico(
         body.programaInterno,
diff --git a/server/controller/Usuario/login.js b/server/controller/Usuario/login.js
index 115602a..b6314ef 100644
--- a/server/controller/Usuario/login.js
+++ b/server/controller/Usuario/login.js
@@ -6,7 +6,12 @@ const Usuario = require(`${dbPath}/Usuario`);
 const TipoUsuario = require(`${dbPath}/TipoUsuario`);
 
 const login = async (body) => {
-  const usuario = validar.validar(body.usuario, 'El usuario', 60);
+  const usuario = validar.validacionBasicaStr(
+    body.usuario,
+    'usuario',
+    true,
+    60
+  );
   const password = validar.validarAlfanumerico(
     body.password,
     'contraseña',
diff --git a/server/controller/Usuario/responsables.js b/server/controller/Usuario/responsables.js
index 85a25b5..b3478bd 100644
--- a/server/controller/Usuario/responsables.js
+++ b/server/controller/Usuario/responsables.js
@@ -15,7 +15,7 @@ const responsables = async (body) => {
     ? validar.validarTexto(body.nombre, 'nombre', true, 60)
     : '';
   const correo = body.correo
-    ? validar.validar(body.correo, 'El correo', 1000)
+    ? validar.validacionBasicaStr(body.correo, 'correo', true, 1000)
     : '';
 
   return Usuario.findAndCountAll({
diff --git a/server/helper/validar.js b/server/helper/validar.js
index 2ebaec1..d1a4849 100644
--- a/server/helper/validar.js
+++ b/server/helper/validar.js
@@ -164,7 +164,6 @@ const validarNumero = (
 */
 const validarObjetoVacio = (obj) => {
   for (let key in obj) if (obj.hasOwnProperty(key)) return false;
-
   return true;
 };