From c205389ca2097e95a95291405f012937311aff4f Mon Sep 17 00:00:00 2001 From: fede Date: Sat, 19 Oct 2024 18:00:58 -0300 Subject: [PATCH] reestructuracion de las entidades Signed-off-by: fede --- Aspnet/Controllers/HomeController.cs | 24 ---------------- Aspnet/Controllers/InquilinoController.cs | 34 ++++++----------------- Aspnet/Controllers/LoginController.cs | 20 +++++++++++-- 3 files changed, 26 insertions(+), 52 deletions(-) delete mode 100644 Aspnet/Controllers/HomeController.cs diff --git a/Aspnet/Controllers/HomeController.cs b/Aspnet/Controllers/HomeController.cs deleted file mode 100644 index d26c238..0000000 --- a/Aspnet/Controllers/HomeController.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace AlquilaFacil.Controllers; - -public class HomeController : Controller -{ - private readonly ILogger _logger; - - public HomeController(ILogger logger) - { - _logger = logger; - } - - public IActionResult Index() - { - return View(); - } - - public IActionResult Privacy() - { - return View(); - } - -} diff --git a/Aspnet/Controllers/InquilinoController.cs b/Aspnet/Controllers/InquilinoController.cs index c7f5391..8e45298 100644 --- a/Aspnet/Controllers/InquilinoController.cs +++ b/Aspnet/Controllers/InquilinoController.cs @@ -4,39 +4,23 @@ using Entidades; namespace AlquilaFacil.Controllers; -public class InquilinoController: Controller +[ApiController] +public class InquilinoController: ControllerBase { - public List inquilinos = new List(); [HttpGet("api/inquilino")] - public IActionResult Get(){ - - var htmlbuild = new StringBuilder(); - foreach (var inquilino in inquilinos) - { - htmlbuild.AppendFormat("{0}{1}{2}{3}", - inquilino.Dni, inquilino.Nombre, inquilino.Apellido, inquilino.Domicilio); - } - return Content(htmlbuild.ToString(), "text/html"); + public IActionResult Get(){ + return Ok(); } [HttpPost("api/inquilino")] - public IActionResult Post([FromForm] Inquilino inq){ + public IActionResult Post([FromForm] Cliente inq){ if (inq == null) return BadRequest("Inquilino inválido."); - if (inq.Dni == 0 ) return BadRequest("No se especifico dni"); - if (inq.Dni < 0 ) return BadRequest("Dni Invalido"); + if (inq.dni == 0 ) return BadRequest("No se especifico dni"); + if (inq.dni < 0 ) return BadRequest("Dni Invalido"); + + return Ok(); - -// no recuerdo porque esto existe -// return Redirect("/Inquilino"); - return Content($"

Inquilino {inq.Nombre} agregado exitosamente.

", "text/html"); } - public IActionResult Index(){ - return View(); - } - - public IActionResult FormAdd(){ - return View(); - } } diff --git a/Aspnet/Controllers/LoginController.cs b/Aspnet/Controllers/LoginController.cs index 4ba34a8..38abacc 100644 --- a/Aspnet/Controllers/LoginController.cs +++ b/Aspnet/Controllers/LoginController.cs @@ -16,13 +16,27 @@ public class LoginController: ControllerBase if (loginDto.Email == String.Empty || loginDto.Contraseña == String.Empty) return Unauthorized(new {message = "Los Datos no llegaron correctamente o faltan"}); var usuario = RepositorioUsuarios.Singleton.CheckUsuario(loginDto); - if (usuario == null) return Unauthorized(new {message = "El usuario no existe o la contraseña es incorrecta"}); + if (!usuario) return Unauthorized(new {message = "El usuario no existe o la contraseña es incorrecta"}); string tokenString = GenerarToken(loginDto); - return Ok( new {Token = tokenString, Redirect = "/Menu"}); + RepositorioUsuarios.Singleton.GuardarToken(loginDto, tokenString); + + return Ok( new {Email = loginDto.Email, Token = tokenString, Redirect = "/Menu"}); } - + [HttpPost("api/login/validar")] + public IActionResult Verificar([FromBody] TokenDto tokenRequest){ + if (tokenRequest.Email == String.Empty ||tokenRequest.Token == string.Empty ||tokenRequest.Redirect == string.Empty) + { + return Unauthorized(new { esValido = false}); + } + + bool esValido = RepositorioUsuarios.Singleton.CheckToken(tokenRequest); + return (esValido) ? + Ok( new { esValido = true}) : Unauthorized( new {esValido = false}); + } + + private string GenerarToken(LoginDto loginDto){ var tokenHandler = new JwtSecurityTokenHandler(); var key = Encoding.ASCII.GetBytes("ffb2cdc15d472e41a5b626e294c45020");