From ccbb887486f44d5ce7f63021130ecb08fb4ea4bf Mon Sep 17 00:00:00 2001
From: "adel.ka" <a.kalimullin@micord.ru>
Date: Fri, 28 Nov 2025 15:10:28 +0300
Subject: [PATCH] SUPPORT-9605: optimization

---
 .../micord/ervu/security/esia/service/EsiaAuthService.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java b/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
index 3b36a016..5d657bb3 100644
--- a/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
+++ b/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
@@ -191,6 +191,7 @@ public class EsiaAuthService {
 
   public void authEsiaTokensByCode(String esiaAuthCode, String state, HttpServletResponse response, HttpServletRequest request) {
     String esiaAccessTokenStr = null;
+    String esiaRefreshTokenStr = null;
     String prnOid = null;
     Long expiresIn = null;
     boolean hasRole = false;
@@ -259,7 +260,7 @@ public class EsiaAuthService {
         throw new EsiaException("Token invalid. State from request not equals with state from response.");
       }
       esiaAccessTokenStr = tokenResponse.getAccessToken();
-      String esiaRefreshTokenStr = tokenResponse.getRefreshToken();
+      esiaRefreshTokenStr = tokenResponse.getRefreshToken();
       startTime = System.currentTimeMillis();
       String verifyResult = verifyToken(esiaAccessTokenStr);
       timeVerifySecret = System.currentTimeMillis() - startTime;
@@ -269,8 +270,6 @@ public class EsiaAuthService {
       EsiaAccessToken esiaAccessToken = ulDataService.readToken(esiaAccessTokenStr);
       prnOid = esiaAccessToken.getSbjId();
       expiresIn = tokenResponse.getExpiresIn();
-      EsiaAuthInfoStore.addAccessToken(prnOid, esiaAccessTokenStr, expiresIn);
-      EsiaAuthInfoStore.addRefreshToken(prnOid, esiaRefreshTokenStr, expiresIn);
     }
     catch (Exception e) {
       throw new EsiaException(e);
@@ -291,6 +290,8 @@ public class EsiaAuthService {
       }
       String ervuId = getErvuId(prnOid, orgInfo);
       status = AuditConstants.SUCCESS_STATUS_TYPE;
+      EsiaAuthInfoStore.addAccessToken(prnOid, esiaAccessTokenStr, expiresIn);
+      EsiaAuthInfoStore.addRefreshToken(prnOid, esiaRefreshTokenStr, expiresIn);
       createTokenAndAddCookie(response, prnOid, ervuId, hasRole, fileUploadAllowed, expiresIn);
     }
     catch (JsonProcessingException e) {