From c3aa0db42df80b1c0e2c9d12aba61d5d136e619b Mon Sep 17 00:00:00 2001 From: fede Date: Tue, 20 May 2025 22:06:09 -0300 Subject: [PATCH] =?UTF-8?q?a=C3=B1adido=20coso?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Aspnet/Controllers/InquilinoController.cs | 32 +++++++++------- Aspnet/Controllers/PropietarioController.cs | 41 +++++++++++++-------- 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/Aspnet/Controllers/InquilinoController.cs b/Aspnet/Controllers/InquilinoController.cs index 7e4b413..84d6fc9 100644 --- a/Aspnet/Controllers/InquilinoController.cs +++ b/Aspnet/Controllers/InquilinoController.cs @@ -9,11 +9,12 @@ using System.Security.Cryptography; namespace AlquilaFacil.Controllers; [ApiController] -public class InquilinoController: ControllerBase +public class InquilinoController : ControllerBase { - + [HttpGet("api/inquilino")] - public IActionResult Get([FromHeader(Name = "Auth")] string Auth) { + public IActionResult Get([FromHeader(Name = "Auth")] string Auth) + { if (!string.IsNullOrEmpty(Auth)) return BadRequest(); var ret = RepositorioPermisos.Singleton.CheckPermisos(Auth, 9); @@ -25,18 +26,20 @@ public class InquilinoController: ControllerBase } [HttpPost("api/inquilino")] - public IActionResult Post([FromBody] CrearClienteDto cid, [FromHeader(Name = "Auth")] string Auth) { - if (string.IsNullOrEmpty(Auth)) return BadRequest(new {message = "El String Auth Esta Vacio"}); + public IActionResult Post([FromBody] CrearClienteDto cid, [FromHeader(Name = "Auth")] string Auth) + { + if (string.IsNullOrEmpty(Auth)) return BadRequest(new { message = "El String Auth Esta Vacio" }); var ret3 = RepositorioPermisos.Singleton.CheckPermisos(Auth, 4); - if (ret3 == false) return BadRequest(new {message = "Falló el permiso"}); + if (ret3 == false) return BadRequest(new { message = "Falló el permiso" }); Cliente? rep = RepositorioUsuarios.Singleton.ObtenerClientePorToken(Auth); if (rep == null) return Unauthorized(); var ret = verificarCrearUsuario(cid); - if (ret != "") return BadRequest(new {message = ret}); - - var cli = new Cliente { + if (ret != "") return BadRequest(new { message = ret }); + + var cli = new Cliente + { Dni = cid.dni, Nombre = cid.nombre, Domicilio = cid.domicilio, @@ -45,13 +48,15 @@ public class InquilinoController: ControllerBase Email = cid.email, Contraseña = Encoding.UTF8.GetBytes(HacerHash(cid.contraseña)), Habilitado = 1, + EmailRecuperacion = cid.email, }; bool ret2 = RepositorioUsuarios.Singleton.AltaInquilino(cli, rep.Dni); - return (ret2) ? Ok(new {message = "Se dio de alta la cuenta"}) : BadRequest(new {message = "Fallo Dar de Alta El inquilino"}); + return (ret2) ? Ok(new { message = "Se dio de alta la cuenta" }) : BadRequest(new { message = "Fallo Dar de Alta El inquilino" }); } - private string verificarCrearUsuario(CrearClienteDto cid) { + private string verificarCrearUsuario(CrearClienteDto cid) + { string msg = ""; if (cid.email == string.Empty) msg += "Falta ingresar el email\n"; @@ -65,8 +70,9 @@ public class InquilinoController: ControllerBase return msg; } - private string HacerHash(string pass){ + private string HacerHash(string pass) + { var buf = SHA256.HashData(Encoding.UTF8.GetBytes(pass)); - return BitConverter.ToString(buf).Replace("-",""); + return BitConverter.ToString(buf).Replace("-", ""); } } diff --git a/Aspnet/Controllers/PropietarioController.cs b/Aspnet/Controllers/PropietarioController.cs index 86588cf..62055d4 100644 --- a/Aspnet/Controllers/PropietarioController.cs +++ b/Aspnet/Controllers/PropietarioController.cs @@ -9,10 +9,12 @@ using Modelo; namespace AlquilaFacil.Controllers; [ApiController] -public class PropietarioController: ControllerBase { +public class PropietarioController : ControllerBase +{ [HttpGet("api/propietario")] - public IActionResult ObtenerPropietarioPorDni(long Dni, [FromHeader(Name ="Auth")] string Auth) { + public IActionResult ObtenerPropietarioPorDni(long Dni, [FromHeader(Name = "Auth")] string Auth) + { if (String.IsNullOrEmpty(Auth)) return Unauthorized(); var validacion1 = RepositorioPermisos.Singleton.CheckPermisos(Auth, 14); if (validacion1 == false) return Unauthorized(); @@ -22,8 +24,9 @@ public class PropietarioController: ControllerBase { } [HttpPost("api/propietario")] - public IActionResult AltaPropietario([FromBody]CrearClienteDto Propietario, - [FromHeader(Name = "Auth")] string Auth) { + public IActionResult AltaPropietario([FromBody] CrearClienteDto Propietario, + [FromHeader(Name = "Auth")] string Auth) + { if (String.IsNullOrEmpty(Auth)) return Unauthorized(); var validacion1 = RepositorioPermisos.Singleton.CheckPermisos(Auth, 5); if (validacion1 == false) return Unauthorized(); @@ -33,8 +36,9 @@ public class PropietarioController: ControllerBase { string validacion2 = verificarCrearUsuario(Propietario); if (validacion2 != "") return BadRequest(validacion2); - - var cli = new Cliente { + + var cli = new Cliente + { Dni = Propietario.dni, Nombre = Propietario.nombre, Domicilio = Propietario.domicilio, @@ -43,15 +47,17 @@ public class PropietarioController: ControllerBase { Email = Propietario.email, Contraseña = Encoding.UTF8.GetBytes(HacerHash(Propietario.contraseña)), Habilitado = 1, + EmailRecuperacion = Propietario.email, }; bool ret = RepositorioUsuarios.Singleton.AltaPropietario(cli, rep.Dni); - return ret ? - Ok(new {message = "Se añadio el propietario exitosamente"}) : BadRequest(); + return ret ? + Ok(new { message = "Se añadio el propietario exitosamente" }) : BadRequest(); } [HttpPatch("api/propietarios")] - public IActionResult PatchPropietario([FromBody]CrearClienteDto Propietario, [FromHeader(Name = "Auth")] string Auth){ + public IActionResult PatchPropietario([FromBody] CrearClienteDto Propietario, [FromHeader(Name = "Auth")] string Auth) + { if (String.IsNullOrEmpty(Auth)) return Unauthorized(); var validacion1 = RepositorioPermisos.Singleton.CheckPermisos(Auth, 5); if (validacion1 == false) return Unauthorized(); @@ -59,7 +65,8 @@ public class PropietarioController: ControllerBase { string validacion2 = verificarCrearUsuario(Propietario); if (validacion2 != "") return BadRequest(validacion2); - var cli = new Cliente { + var cli = new Cliente + { Dni = Propietario.dni, Nombre = Propietario.nombre, Domicilio = Propietario.domicilio, @@ -69,11 +76,12 @@ public class PropietarioController: ControllerBase { Contraseña = Encoding.UTF8.GetBytes(HacerHash(Propietario.contraseña)) }; var ret = RepositorioUsuarios.Singleton.ActualizarPropietario(cli); - return ret ? - Ok(new {message = "Se Modifico el propietario exitosamente"}) : BadRequest(); + return ret ? + Ok(new { message = "Se Modifico el propietario exitosamente" }) : BadRequest(); } - private string verificarCrearUsuario(CrearClienteDto cid) { + private string verificarCrearUsuario(CrearClienteDto cid) + { string msg = ""; if (cid.email == string.Empty) msg += "Falta ingresar el email\n"; @@ -87,8 +95,9 @@ public class PropietarioController: ControllerBase { return msg; } - private string HacerHash(string pass){ + private string HacerHash(string pass) + { var buf = SHA256.HashData(Encoding.UTF8.GetBytes(pass)); - return BitConverter.ToString(buf).Replace("-",""); + return BitConverter.ToString(buf).Replace("-", ""); } -} \ No newline at end of file +}