From de8d6a1d3c6935c3f503f9cc287baabca9cd1b8f Mon Sep 17 00:00:00 2001
From: Daniel Arroyo <darroyo@kiosolutions.com>
Date: Sat, 31 Dec 2022 12:21:45 -0300
Subject: [PATCH] cambios

---
 .../api/menu/playa/controller/LoginController.java |  6 ++++++
 .../java/api/menu/playa/helper/LoginHelper.java    | 14 +++++++++-----
 src/main/java/api/menu/playa/util/TokenUtils.java  |  5 +++--
 .../java/api/menu/playa/vo/CambioCantidadVO.java   |  1 +
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/main/java/api/menu/playa/controller/LoginController.java b/src/main/java/api/menu/playa/controller/LoginController.java
index d3709cf..0980e4d 100644
--- a/src/main/java/api/menu/playa/controller/LoginController.java
+++ b/src/main/java/api/menu/playa/controller/LoginController.java
@@ -10,6 +10,8 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.jboss.logging.Logger;
+
 import api.menu.playa.exceptions.NegocioException;
 import api.menu.playa.helper.LoginHelper;
 import api.menu.playa.vo.RegistroVO;
@@ -25,6 +27,9 @@ public class LoginController {
     private static final String SUCCESS = "SUCCESS";
     private static final String ERROR = "ERROR";
 
+    @Inject
+    Logger logger;
+
     @Inject
     LoginHelper loginHelper;
     
@@ -39,6 +44,7 @@ public class LoginController {
         } catch (NegocioException e) {
             return Response.ok(new ResponseGlobal<>(e.getCode(), e.getMessage())).build();
         } catch (Exception e) {
+            logger.error(e);
             return Response.ok(new ResponseGlobal<>(1, ERROR)).build();
         }
     }
diff --git a/src/main/java/api/menu/playa/helper/LoginHelper.java b/src/main/java/api/menu/playa/helper/LoginHelper.java
index 5895f22..16de550 100644
--- a/src/main/java/api/menu/playa/helper/LoginHelper.java
+++ b/src/main/java/api/menu/playa/helper/LoginHelper.java
@@ -1,18 +1,15 @@
 package api.menu.playa.helper;
 
 import java.security.Key;
-import java.util.Arrays;
 import java.util.Base64;
 import java.util.Collections;
-import java.util.HashSet;
-import java.util.Optional;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import org.eclipse.microprofile.jwt.Claims;
+import org.jboss.logging.Logger;
 
 import api.menu.playa.dao.UsuarioDAO;
 import api.menu.playa.enums.RolesEnum;
@@ -21,11 +18,13 @@ import api.menu.playa.model.Usuario;
 import api.menu.playa.util.TokenUtils;
 import api.menu.playa.vo.RegistroVO;
 import api.menu.playa.vo.UsuarioVO;
-import io.smallrye.jwt.build.Jwt;
 
 @ApplicationScoped
 public class LoginHelper {
 
+    @Inject
+    Logger logger;
+
     @Inject
     UsuarioDAO usuarioDAO;
 
@@ -52,12 +51,17 @@ public class LoginHelper {
 
         Usuario user = usuarioDAO.encontrarUsuario(request.getUser());
 
+        logger.debug("Usuario");
+        logger.debug(user);
+
         if (user == null) {
             throw new NegocioException("Usuario no existe en el sistema", 2);
         }
 
         String password = encript(request.getPass());
 
+        logger.debug("Password encriptado");
+        logger.debug(password);
 
         if (!user.getActivo()) {
             throw new NegocioException("Usuario no se encuentra activo", 2);
diff --git a/src/main/java/api/menu/playa/util/TokenUtils.java b/src/main/java/api/menu/playa/util/TokenUtils.java
index 2fe82e8..14d6e19 100644
--- a/src/main/java/api/menu/playa/util/TokenUtils.java
+++ b/src/main/java/api/menu/playa/util/TokenUtils.java
@@ -8,12 +8,13 @@ import java.util.Base64;
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.management.relation.Role;
+import javax.enterprise.context.ApplicationScoped;
 
 import api.menu.playa.enums.RolesEnum;
 import io.smallrye.jwt.build.Jwt;
 import io.smallrye.jwt.build.JwtClaimsBuilder;
 
+@ApplicationScoped
 public class TokenUtils {
 
 	public static String generateToken(String username, Set<RolesEnum> roles, Long duration, String issuer) throws Exception {
@@ -32,7 +33,7 @@ public class TokenUtils {
 		claimsBuilder.expiresAt(currentTimeInSecs + duration);
 		claimsBuilder.groups(groups);
 
-		return claimsBuilder.jws().signatureKeyId(privateKeyLocation).sign(privateKey);
+		return claimsBuilder.jws().keyId(privateKeyLocation).sign(privateKey);
 	}
 
 	public static PrivateKey readPrivateKey(final String pemResName) throws Exception {
diff --git a/src/main/java/api/menu/playa/vo/CambioCantidadVO.java b/src/main/java/api/menu/playa/vo/CambioCantidadVO.java
index 2ae52dc..54c4cdd 100644
--- a/src/main/java/api/menu/playa/vo/CambioCantidadVO.java
+++ b/src/main/java/api/menu/playa/vo/CambioCantidadVO.java
@@ -2,6 +2,7 @@ package api.menu.playa.vo;
 
 import api.menu.playa.enums.CambioCantidadEnum;
 
+
 public class CambioCantidadVO {
     
     private Long detalle;