From 996c519e9379375013be72d7a53dd0fe74a5abb0 Mon Sep 17 00:00:00 2001
From: Daniel Arroyo <darroylat@gmail.com>
Date: Sun, 8 Jan 2023 23:36:53 -0300
Subject: [PATCH] revision

---
 .../menu/playa/controller/LoginController.java  |  1 -
 .../menu/playa/controller/OrdenController.java  |  5 +----
 .../java/api/menu/playa/helper/LoginHelper.java | 17 ++---------------
 .../java/api/menu/playa/util/TokenUtils.java    |  1 -
 src/main/resources/application.properties       |  4 ++--
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/main/java/api/menu/playa/controller/LoginController.java b/src/main/java/api/menu/playa/controller/LoginController.java
index a2415c4..5943206 100644
--- a/src/main/java/api/menu/playa/controller/LoginController.java
+++ b/src/main/java/api/menu/playa/controller/LoginController.java
@@ -14,7 +14,6 @@ import javax.ws.rs.core.Response;
 
 import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.jboss.logging.Logger;
-import org.jboss.resteasy.reactive.RestHeader;
 
 import api.menu.playa.enums.RolesEnum;
 import api.menu.playa.exceptions.NegocioException;
diff --git a/src/main/java/api/menu/playa/controller/OrdenController.java b/src/main/java/api/menu/playa/controller/OrdenController.java
index cdd65e0..2c6ba72 100644
--- a/src/main/java/api/menu/playa/controller/OrdenController.java
+++ b/src/main/java/api/menu/playa/controller/OrdenController.java
@@ -3,8 +3,6 @@ package api.menu.playa.controller;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.eclipse.microprofile.jwt.JsonWebToken;
-
 import api.menu.playa.exceptions.NegocioException;
 import api.menu.playa.helper.OrdenHelper;
 import api.menu.playa.vo.CambioCantidadVO;
@@ -14,7 +12,6 @@ import api.menu.playa.vo.ProductoIdVO;
 import api.menu.playa.vo.ResponseGlobal;
 
 import java.util.List;
-import java.util.Optional;
 
 import javax.annotation.security.PermitAll;
 import javax.annotation.security.RolesAllowed;
@@ -47,7 +44,7 @@ public class OrdenController {
      * Creacion de orden
      */
 
-    //@RolesAllowed({"USER", "ADMIN"})
+    @RolesAllowed({"USER", "ADMIN"})
     @GET
     @Path("/create")
     public Response create() {
diff --git a/src/main/java/api/menu/playa/helper/LoginHelper.java b/src/main/java/api/menu/playa/helper/LoginHelper.java
index 990d53b..1d32c8e 100644
--- a/src/main/java/api/menu/playa/helper/LoginHelper.java
+++ b/src/main/java/api/menu/playa/helper/LoginHelper.java
@@ -1,12 +1,7 @@
 package api.menu.playa.helper;
 
-import java.io.InputStream;
 import java.security.Key;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Base64;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -16,23 +11,15 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 
-import org.eclipse.microprofile.jwt.Claims;
-import org.eclipse.microprofile.jwt.JsonWebToken;
 import org.jboss.logging.Logger;
-import org.jose4j.jwk.JsonWebKey;
-import org.jose4j.jws.JsonWebSignature;
-import org.jose4j.keys.resolvers.JwksVerificationKeyResolver;
 
 import api.menu.playa.dao.UsuarioDAO;
 import api.menu.playa.enums.RolesEnum;
 import api.menu.playa.exceptions.NegocioException;
 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.auth.principal.DefaultJWTParser;
 import io.smallrye.jwt.build.Jwt;
-import io.smallrye.jwt.build.JwtSignature;
 
 @ApplicationScoped
 public class LoginHelper {
@@ -112,7 +99,7 @@ public class LoginHelper {
         return Base64.getEncoder().encodeToString(encrypted);
     }
 
-    private static String decrypt(String encrypted) throws Exception {
+    /* private static String decrypt(String encrypted) throws Exception {
         byte[] encryptedBytes = Base64.getDecoder().decode(encrypted.replace("\n", ""));
 
         Key aesKey = new SecretKeySpec(ENCRYPT_KEY.getBytes(), "AES");
@@ -123,7 +110,7 @@ public class LoginHelper {
         String decrypted = new String(cipher.doFinal(encryptedBytes));
 
         return decrypted;
-    }
+    } */
 
     public int currentTimeInSecs() {
 		long currentTimeMS = System.currentTimeMillis();
diff --git a/src/main/java/api/menu/playa/util/TokenUtils.java b/src/main/java/api/menu/playa/util/TokenUtils.java
index f2feadd..51cb8da 100644
--- a/src/main/java/api/menu/playa/util/TokenUtils.java
+++ b/src/main/java/api/menu/playa/util/TokenUtils.java
@@ -10,7 +10,6 @@ import java.util.Map;
 import javax.enterprise.context.ApplicationScoped;
 
 import org.eclipse.microprofile.config.ConfigProvider;
-import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.eclipse.microprofile.jwt.Claims;
 import org.jose4j.jws.AlgorithmIdentifiers;
 import org.jose4j.jws.JsonWebSignature;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 8967b29..7e8d57a 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -17,8 +17,8 @@ quarkus.datasource.inventory.jdbc.max-size=12
 quarkus.hibernate-orm.database.generation=update
 
 
-config.private.key=/privateKey.pem
-mp.jwt.verify.publickey.location=publicKey.pem
+config.private.key=/privatekey.pem
+mp.jwt.verify.publickey.location=publickey.pem
 mp.jwt.verify.issuer=https://vodorod.cl
 
 quarkus.smallrye-jwt.enabled=true