From bd35689d6cf22dc877b6e51c020e9340d0130b06 Mon Sep 17 00:00:00 2001
From: Igor I <ivanov.i@istt.kz>
Date: Thu, 3 Apr 2025 18:10:24 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=9F=D0=BE=D0=BB=D1=83=D1=87=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/ccalm/jwt/MainController.java    | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/ccalm/jwt/MainController.java b/src/main/java/org/ccalm/jwt/MainController.java
index ce0bd51..debdfdb 100644
--- a/src/main/java/org/ccalm/jwt/MainController.java
+++ b/src/main/java/org/ccalm/jwt/MainController.java
@@ -500,26 +500,17 @@ public class MainController implements ServletContextAware {
     @RequestMapping(value = "/access", method = {RequestMethod.POST}, produces = "application/json;charset=utf-8")
     @ResponseBody
     public ResponseEntity<Object> access(
-            Model model,
-            @CookieValue(value = "jwt_a", defaultValue = "") String jwt_a,
+            Authentication authentication,
             @Nullable @RequestBody ActionNameModel action_name,
             @CookieValue(value = "lng", defaultValue = "1") String language_id
     ) {
         Translation trt = new Translation(language_id, jdbcTemplate);
         try {
-            if (jwt_a.isEmpty() || countOccurrences(jwt_a, '.') != 2) {
-                return new ResponseEntity<>(new ErrorResponseModel(10000, trt.trt(false, "Please_log_in"), null, null), HttpStatus.INTERNAL_SERVER_ERROR);
-            }
-
-            Jws<Claims> claims;
-            try {
-                claims = Jwts.parserBuilder()
-                        .setSigningKey(getPublicKey())
-                        .build()
-                        .parseClaimsJws(jwt_a);
-            } catch (Exception e) {
-                return new ResponseEntity<>(new ErrorResponseModel(10000, Arrays.asList(trt.trt(false, "Please_log_in"), trt.trt(false, "JWT_token_verification_error")), null, null), HttpStatus.INTERNAL_SERVER_ERROR);
+            if (authentication == null || !authentication.isAuthenticated()) {
+                String uuid = UUID.randomUUID().toString();
+                return new ResponseEntity<>(new ErrorResponseModel(10401, trt.trt(false, "Please_log_in"), null, uuid), HttpStatus.UNAUTHORIZED);
             }
+            UserDetails userDetails = (UserDetails) authentication.getPrincipal();
 
             String sql = """
                 select
@@ -533,7 +524,7 @@ public class MainController implements ServletContextAware {
                 """;
 
             MapSqlParameterSource parameters = new MapSqlParameterSource();
-            parameters.addValue("user_id", claims.getBody().get("user_id"));
+            parameters.addValue("user_id", userDetails.getUserId());
             if (action_name == null) {
                 parameters.addValue("action_name", null);
             } else {