Skip to content

fix: concurrent session logout not invalidating JWT on first system #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snehar-nd merged 1 commit into from
May 14, 2026
Merged

fix: concurrent session logout not invalidating JWT on first system #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions src/main/java/com/iemr/common/controller/users/IEMRAdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down Expand Up @@ -95,6 +96,8 @@ public class IEMRAdminController {
private CookieUtil cookieUtil;
@Autowired
private RedisTemplate<String, Object> redisTemplate;
@Autowired
private StringRedisTemplate stringRedisTemplate;

private AESUtil aesUtil;

Expand Down Expand Up @@ -197,11 +200,10 @@ public String userAuthenticate(
user.setUserName(mUser.get(0).getUserName());
logger.info("UserAgentUtil isMobile : " + isMobile);

// Store username → JTI mapping so concurrent-session logout can denylist this token
String accessJti = jwtUtil.getJtiFromToken(jwtToken);
redisTemplate.opsForValue().set(
// Store username -> JTI mapping so concurrent-session logout can denylist this token
stringRedisTemplate.opsForValue().set(
"jti:" + m_User.getUserName().trim().toLowerCase(),
accessJti + "|" + mUser.get(0).getUserID(),
jwtUtil.getJtiFromToken(jwtToken) + "|" + mUser.get(0).getUserID(),
jwtUtil.getAccessTokenExpiration(),
TimeUnit.MILLISECONDS
);
Expand Down Expand Up @@ -397,17 +399,16 @@ public String logOutUserFromConcurrentSession(
deleteSessionObjectByGettingSessionDetails(previousTokenFromRedis);
sessionObject.deleteSessionObject(previousTokenFromRedis);

// Denylist the active JWT so the first system's requests are immediately rejected
// Denylist the active JWT so System 1's requests are immediately rejected
String usernameKey = mUsers.get(0).getUserName().trim().toLowerCase();
String jtiData = (String) redisTemplate.opsForValue().get("jti:" + usernameKey);
String jtiData = stringRedisTemplate.opsForValue().get("jti:" + usernameKey);
if (jtiData != null) {
String[] parts = jtiData.split("\\|", 2);
String jti = parts[0];
tokenDenylist.addTokenToDenylist(jti, jwtUtil.getAccessTokenExpiration());
tokenDenylist.addTokenToDenylist(parts[0], jwtUtil.getAccessTokenExpiration());
if (parts.length > 1) {
redisTemplate.delete("user_" + parts[1]);
}
redisTemplate.delete("jti:" + usernameKey);
stringRedisTemplate.delete("jti:" + usernameKey);
}

response.setResponse("User successfully logged out");
Expand Down Expand Up @@ -545,11 +546,10 @@ public String superUserAuthenticate(
isMobile = UserAgentUtil.isMobileDevice(userAgent);
logger.info("UserAgentUtil isMobile : " + isMobile);

// Store username → JTI mapping so concurrent-session logout can denylist this token
String accessJti = jwtUtil.getJtiFromToken(jwtToken);
redisTemplate.opsForValue().set(
// Store username -> JTI mapping so concurrent-session logout can denylist this token
stringRedisTemplate.opsForValue().set(
"jti:" + m_User.getUserName().trim().toLowerCase(),
accessJti + "|" + mUser.getUserID(),
jwtUtil.getJtiFromToken(jwtToken) + "|" + mUser.getUserID(),
jwtUtil.getAccessTokenExpiration(),
TimeUnit.MILLISECONDS
);
Expand Down
Loading