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

SUPPORT-8579: Fix

Browse source
This commit is contained in:
Eduard Tihomirov 2024-10-07 13:34:00 +03:00
parent d5082c3ce2
commit 52935a15a5
2 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backend/src/main/java/ru/micord/ervu/security/esia/service/EsiaAuthService.java
View file

@ -358,7 +358,6 @@ public class EsiaAuthService {
public String logout(HttpServletRequest request, HttpServletResponse response) {
try {
Cookie[] cookies = request.getCookies();
String authToken = null;
if (cookies != null)
for (Cookie cookie : cookies) {
if (cookie.getName().equals("webbpm.ervu-lkrp-fl")) {
@ -368,16 +367,13 @@ public class EsiaAuthService {
response.addCookie(cookie);
}
else if (cookie.getName().equals("auth_token")) {
authToken = cookie.getValue();
cookie.setValue("");
cookie.setPath(cookie.getPath());
cookie.setMaxAge(0);
response.addCookie(cookie);
}
}
Token token = jwtTokenService.getToken(authToken);
String[] ids = token.getUserAccountId().split(":");
String userId = ids[0];
String userId = jwtTokenService.getUserAccountId(request);
TokensStore.removeAccessToken(userId);
TokensStore.removeRefreshToken(userId);
String logoutUrl = esiaConfig.getEsiaBaseUri() + esiaConfig.getEsiaLogoutUrl();

2
backend/src/main/java/ru/micord/ervu/security/webbpm/jwt/service/JwtTokenService.java
View file

@ -96,7 +96,7 @@ public class JwtTokenService {
return TokensStore.getRefreshToken(getUserAccountId(request));
}
private String getUserAccountId(HttpServletRequest request) {
public String getUserAccountId(HttpServletRequest request) {
String authToken = null;
Cookie[] cookies = request.getCookies();
if (cookies != null) {