From e768fc8fb51f76a02cb818631d32d0d811224725 Mon Sep 17 00:00:00 2001
From: Eduard Tihomirov <tikhomirov@micord.ru>
Date: Thu, 15 May 2025 14:46:42 +0300
Subject: [PATCH] SUPPORT-9171: Fix

---
 .../security/esia/service/EsiaAuthService.java | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 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 d4f5cc01..81a3a263 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
@@ -416,12 +416,18 @@ public class EsiaAuthService {
     String userId = null;
     String status = null;
     try {
-      userId = jwtTokenService.getUserAccountId(request);
-      String accessToken = EsiaAuthInfoStore.getAccessToken(userId);
-      orgInfo = getOrgInfo(accessToken);
-      securityHelper.clearAccessCookies(response);
-      EsiaAuthInfoStore.removeAccessToken(userId);
-      EsiaAuthInfoStore.removeRefreshToken(userId);
+      try {
+        userId = jwtTokenService.getUserAccountId(request);
+        String accessToken = EsiaAuthInfoStore.getAccessToken(userId);
+        orgInfo = getOrgInfo(accessToken);
+        securityHelper.clearAccessCookies(response);
+        EsiaAuthInfoStore.removeAccessToken(userId);
+        EsiaAuthInfoStore.removeRefreshToken(userId);
+      }
+      catch (Exception e) {
+        //logout should always happen
+      }
+
       String logoutUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaLogoutUrl();
       String redirectUrl = esiaConfig.getLogoutRedirectUrl();
       URL url = new URL(logoutUrl);