From 5e050590faf73f9a0724808594f496b3b5f1d29e Mon Sep 17 00:00:00 2001
From: Eduard Tihomirov <tikhomirov@micord.ru>
Date: Tue, 19 Nov 2024 15:31:19 +0300
Subject: [PATCH] fix

---
 .../ervu/security/esia/token/TokensStore.java | 28 +++++++++----------
 .../webbpm/jwt/service/JwtTokenService.java   |  8 +++---
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/token/TokensStore.java b/backend/src/main/java/ru/micord/ervu/security/esia/token/TokensStore.java
index 9804b80..dd0f029 100644
--- a/backend/src/main/java/ru/micord/ervu/security/esia/token/TokensStore.java
+++ b/backend/src/main/java/ru/micord/ervu/security/esia/token/TokensStore.java
@@ -7,54 +7,54 @@ import java.util.concurrent.ConcurrentHashMap;
  * @author Eduard Tihomirov
  */
 public class TokensStore {
-  private static final Map<String, ExpiringToken> accessTokensMap = new ConcurrentHashMap<>();
-  private static final Map<String, ExpiringToken> refreshTokensMap = new ConcurrentHashMap<>();
+  private static final Map<String, ExpiringToken> ACCESS_TOKENS_MAP = new ConcurrentHashMap<>();
+  private static final Map<String, ExpiringToken> REFRESH_TOKENS_MAP = new ConcurrentHashMap<>();
 
   public static void addAccessToken(String prnOid, String token, long expiresIn) {
     if (token != null) {
       long expiryTime = System.currentTimeMillis() + 1000L * expiresIn;
-      accessTokensMap.put(prnOid, new ExpiringToken(token, expiryTime));
+      ACCESS_TOKENS_MAP.put(prnOid, new ExpiringToken(token, expiryTime));
     }
   }
 
   public static String getAccessToken(String prnOid) {
-    return accessTokensMap.get(prnOid).getAccessToken();
+    return ACCESS_TOKENS_MAP.get(prnOid).getAccessToken();
   }
 
   public static void removeExpiredAccessToken() {
-    for (String key : accessTokensMap.keySet()) {
-      ExpiringToken token = accessTokensMap.get(key);
+    for (String key : ACCESS_TOKENS_MAP.keySet()) {
+      ExpiringToken token = ACCESS_TOKENS_MAP.get(key);
       if (token != null && token.isExpired()) {
-        accessTokensMap.remove(key);
+        ACCESS_TOKENS_MAP.remove(key);
       }
     }
   }
 
   public static void removeExpiredRefreshToken() {
-    for (String key : refreshTokensMap.keySet()) {
-      ExpiringToken token = refreshTokensMap.get(key);
+    for (String key : REFRESH_TOKENS_MAP.keySet()) {
+      ExpiringToken token = REFRESH_TOKENS_MAP.get(key);
       if (token != null && token.isExpired()) {
-        refreshTokensMap.remove(key);
+        REFRESH_TOKENS_MAP.remove(key);
       }
     }
   }
 
   public static void removeAccessToken(String prnOid) {
-    accessTokensMap.remove(prnOid);
+    ACCESS_TOKENS_MAP.remove(prnOid);
   }
 
   public static void addRefreshToken(String prnOid, String token, long expiresIn) {
     if (token != null) {
       long expiryTime = System.currentTimeMillis() + 1000L * expiresIn;
-      refreshTokensMap.put(prnOid, new ExpiringToken(token, expiryTime));
+      REFRESH_TOKENS_MAP.put(prnOid, new ExpiringToken(token, expiryTime));
     }
   }
 
   public static String getRefreshToken(String prnOid) {
-    return refreshTokensMap.get(prnOid).getAccessToken();
+    return REFRESH_TOKENS_MAP.get(prnOid).getAccessToken();
   }
 
   public static void removeRefreshToken(String prnOid) {
-    refreshTokensMap.remove(prnOid);
+    REFRESH_TOKENS_MAP.remove(prnOid);
   }
 }
diff --git a/backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java b/backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
index 5478da2..a9c41d2 100644
--- a/backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
+++ b/backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
@@ -32,7 +32,7 @@ public class JwtTokenService {
   @Value("${webbpm.security.token.issuer:#{null}}")
   private final String tokenIssuerName =
           ResourceMetadataUtils.PROJECT_GROUP_ID + "." + ResourceMetadataUtils.PROJECT_ARTIFACT_ID;
-  private final SecretKey SIGNING_KEY;
+  private final SecretKey signingKey;
 
   @Autowired
   private HttpServletRequest request;
@@ -41,7 +41,7 @@ public class JwtTokenService {
   public JwtTokenService(@Value("${webbpm.security.token.secret.key:ZjE5ZjMxNmYtODViZC00ZTQ5LWIxZmYtOGEzYzE3Yjc1MDVk}")
                              String secretKey) {
     byte[] encodedKey = Base64.getDecoder().decode(secretKey);
-    this.SIGNING_KEY = Keys.hmacShaKeyFor(encodedKey);
+    this.signingKey = Keys.hmacShaKeyFor(encodedKey);
   }
 
   public Token createAccessToken(String userAccountId, Long expiresIn, String ervuId) {
@@ -52,7 +52,7 @@ public class JwtTokenService {
             .setIssuer(tokenIssuerName)
             .setIssuedAt(new Date(System.currentTimeMillis()))
             .setExpiration(expirationDate)
-            .signWith(SIGNING_KEY)
+            .signWith(signingKey)
             .compact();
     return new Token(userAccountId + ":" + ervuId, tokenIssuerName, expirationDate, value);
   }
@@ -72,7 +72,7 @@ public class JwtTokenService {
 
   public Token getToken(String token) {
     Claims claims = Jwts.parser()
-        .setSigningKey(SIGNING_KEY)
+        .setSigningKey(signingKey)
         .parseClaimsJws(token)
         .getBody();