From be04288309497c017993b8c0edb49f9c92b6792f Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Wed, 26 Feb 2025 12:43:59 +0300 Subject: [PATCH] SUPPORT-8942: Fix --- .../service/fileupload/EmployeeInfoFileUploadService.java | 2 +- .../ervu/security/esia/{token => }/EsiaAuthInfoStore.java | 4 +++- .../ervu/security/esia/{token => model}/ExpiringState.java | 2 +- .../ervu/security/esia/{token => model}/ExpiringToken.java | 2 +- .../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, 13 insertions(+), 10 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 (93%) rename backend/src/main/java/ru/micord/ervu/security/esia/{token => model}/ExpiringToken.java (93%) rename backend/src/main/java/ru/micord/ervu/security/esia/{token => service}/EsiaAuthInfoClearShedulerService.java (70%) diff --git a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java index a479012c..09fd48d4 100644 --- a/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java +++ b/backend/src/main/java/ervu/service/fileupload/EmployeeInfoFileUploadService.java @@ -35,7 +35,7 @@ import ru.micord.ervu.exception.JsonParsingException; import ru.micord.ervu.security.esia.model.EmployeeModel; import ru.micord.ervu.security.esia.model.PersonModel; import ru.micord.ervu.security.esia.service.UlDataService; -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.service.InteractionService; 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 ee8ea8ac..a127eec5 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 93% 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 74662236..3b1bf1b1 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 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 93% 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 f6a476e4..9ce0d415 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 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 caea622d..299876f7 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 01594a00..f8aa9400 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 @@ -37,7 +37,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.OrganizationModel; -import ru.micord.ervu.security.esia.token.EsiaAuthInfoStore; +import ru.micord.ervu.security.esia.EsiaAuthInfoStore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.context.SecurityContext; 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 19dfd99c..0744ef7a 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.model.Token; import ru.cg.webbpm.modules.resources.api.ResourceMetadataUtils; diff --git a/config/standalone/dev/standalone.xml b/config/standalone/dev/standalone.xml index b595148b..cd7fd6b2 100644 --- a/config/standalone/dev/standalone.xml +++ b/config/standalone/dev/standalone.xml @@ -93,7 +93,7 @@ - +