From f7c234bd5011f68591850aee1f74f3f33fb59373 Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Wed, 26 Feb 2025 12:44:07 +0300 Subject: [PATCH] SUPPORT-8942: Fix --- .../java/ru/micord/ervu/controller/ExtractController.java | 2 +- .../ervu/security/esia/{token => }/EsiaAuthInfoStore.java | 4 +++- .../ervu/security/esia/{token => model}/ExpiringState.java | 4 ++-- .../ervu/security/esia/{token => model}/ExpiringToken.java | 4 ++-- .../EsiaAuthInfoClearShedulerService.java | 7 ++++--- .../micord/ervu/security/esia/service/EsiaAuthService.java | 2 +- .../ervu/security/webbpm/jwt/service/JwtTokenService.java | 2 +- config/standalone/dev/standalone.xml | 2 +- 8 files changed, 15 insertions(+), 12 deletions(-) rename backend/src/main/java/ru/micord/ervu/security/esia/{token => }/EsiaAuthInfoStore.java (95%) rename backend/src/main/java/ru/micord/ervu/security/esia/{token => model}/ExpiringState.java (88%) rename backend/src/main/java/ru/micord/ervu/security/esia/{token => model}/ExpiringToken.java (89%) rename backend/src/main/java/ru/micord/ervu/security/esia/{token => service}/EsiaAuthInfoClearShedulerService.java (70%) diff --git a/backend/src/main/java/ru/micord/ervu/controller/ExtractController.java b/backend/src/main/java/ru/micord/ervu/controller/ExtractController.java index 77d659b..1b90386 100644 --- a/backend/src/main/java/ru/micord/ervu/controller/ExtractController.java +++ b/backend/src/main/java/ru/micord/ervu/controller/ExtractController.java @@ -24,7 +24,7 @@ import ru.micord.ervu.kafka.dto.FullExtract; import ru.micord.ervu.kafka.service.ReplyingKafkaService; import ru.micord.ervu.security.esia.model.PersonModel; import ru.micord.ervu.security.esia.service.PersonalDataService; -import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; +import ru.micord.ervu.security.esia.EsiaAuthInfoStore; import ru.micord.ervu.security.webbpm.jwt.UserIdsPair; import ru.micord.ervu.security.webbpm.jwt.util.SecurityUtil; diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoStore.java b/backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java similarity index 95% rename from backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoStore.java rename to backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java index ee8ea8a..a127eec 100644 --- a/backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoStore.java +++ b/backend/src/main/java/ru/micord/ervu/security/esia/EsiaAuthInfoStore.java @@ -1,4 +1,4 @@ -package ru.micord.ervu.security.esia.token; +package ru.micord.ervu.security.esia; import java.lang.invoke.MethodHandles; import java.util.Map; @@ -6,6 +6,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import ru.micord.ervu.security.esia.model.ExpiringState; +import ru.micord.ervu.security.esia.model.ExpiringToken; /** * @author Eduard Tihomirov diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringState.java b/backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringState.java similarity index 88% rename from backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringState.java rename to backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringState.java index 7466223..7584b66 100644 --- a/backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringState.java +++ b/backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringState.java @@ -1,4 +1,4 @@ -package ru.micord.ervu.security.esia.token; +package ru.micord.ervu.security.esia.model; /** * @author Eduard Tihomirov @@ -28,7 +28,7 @@ public class ExpiringState { this.expiryTime = expiryTime; } - boolean isExpired() { + public boolean isExpired() { return System.currentTimeMillis() > expiryTime; } } diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringToken.java b/backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringToken.java similarity index 89% rename from backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringToken.java rename to backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringToken.java index f6a476e..a20b88c 100644 --- a/backend/src/main/java/ru/micord/ervu/security/esia/token/ExpiringToken.java +++ b/backend/src/main/java/ru/micord/ervu/security/esia/model/ExpiringToken.java @@ -1,4 +1,4 @@ -package ru.micord.ervu.security.esia.token; +package ru.micord.ervu.security.esia.model; /** * @author Eduard Tihomirov @@ -28,7 +28,7 @@ public class ExpiringToken { this.expiryTime = expiryTime; } - boolean isExpired() { + public boolean isExpired() { return System.currentTimeMillis() > expiryTime; } } diff --git a/backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoClearShedulerService.java b/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthInfoClearShedulerService.java similarity index 70% rename from backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoClearShedulerService.java rename to backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthInfoClearShedulerService.java index caea622..299876f 100644 --- a/backend/src/main/java/ru/micord/ervu/security/esia/token/EsiaAuthInfoClearShedulerService.java +++ b/backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthInfoClearShedulerService.java @@ -1,17 +1,18 @@ -package ru.micord.ervu.security.esia.token; +package ru.micord.ervu.security.esia.service; import net.javacrumbs.shedlock.core.SchedulerLock; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import ru.micord.ervu.security.esia.EsiaAuthInfoStore; /** * @author Eduard Tihomirov */ @Service public class EsiaAuthInfoClearShedulerService { - @Scheduled(cron = "${esia.token.clear.cron:0 0 */1 * * *}") - @SchedulerLock(name = "clearToken") + @Scheduled(cron = "${esia.auth.info.clear.cron:0 0 */1 * * *}") + @SchedulerLock(name = "clearAuthInfo") @Transactional public void run() { EsiaAuthInfoStore.removeExpiredRefreshToken(); 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 67efc80..9bfee2e 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 @@ -41,7 +41,7 @@ import ru.micord.ervu.security.esia.model.EsiaHeader; import ru.micord.ervu.security.esia.model.EsiaTokenResponse; import ru.micord.ervu.security.esia.model.FormUrlencoded; import ru.micord.ervu.security.esia.model.PersonModel; -import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; +import ru.micord.ervu.security.esia.EsiaAuthInfoStore; import ru.micord.ervu.security.esia.config.EsiaConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; 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 7ca9332..f3bf402 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 @@ -14,7 +14,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; +import ru.micord.ervu.security.esia.EsiaAuthInfoStore; import ru.micord.ervu.security.webbpm.jwt.UserIdsPair; import ru.micord.ervu.security.webbpm.jwt.model.Token; diff --git a/config/standalone/dev/standalone.xml b/config/standalone/dev/standalone.xml index bce507f..dd6e0df 100644 --- a/config/standalone/dev/standalone.xml +++ b/config/standalone/dev/standalone.xml @@ -79,7 +79,7 @@ - +