micord/ervu-lkrp-fl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SUPPORT-8817: fix for review (1)

Browse source
This commit is contained in:
Рауф Латыпов 2025-01-16 13:24:22 +03:00
parent 08c1555e4e
commit 0b29dea6a2
3 changed files with 44 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/main/java/ru/micord/ervu/controller/ExtractController.java
View file

@ -56,9 +56,9 @@ public class ExtractController {
).get();
}
else {
String userAccountId = SecurityUtil.getUserId();
if (userAccountId != null) {
String esiaAccessToken = EsiaTokensStore.getAccessToken(userAccountId);
String esiaUserId = SecurityUtil.getUserIdsPair().getEsiaUserId();
if (esiaUserId != null) {
String esiaAccessToken = EsiaTokensStore.getAccessToken(esiaUserId);
PersonModel personModel = personalDataService.getPersonModel(esiaAccessToken);
ExtractEmptyRequestDto emptyRequest = new ExtractEmptyRequestDto(personModel.getLastName(),

12
backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/util/SecurityUtil.java
View file

@ -25,19 +25,11 @@ public final class SecurityUtil {
}
public static String getErvuId() {
return getUserAccountIdPart(1);
}
public static String getUserId() {
return getUserAccountIdPart(0);
}
private static String getUserAccountIdPart(int index) {
return Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication())
.map(a -> ((JwtAuthentication) a).getUserAccountId())
.map(userAccountId -> {
String userAccountIdPart = userAccountId.split(":")[index];
return "null".equals(userAccountIdPart) ? null : userAccountIdPart;
String ervuId = userAccountId.split(":")[1];
return "null".equals(ervuId) ? null : ervuId;
})
.orElse(null);
}