Skip to content

Remove PII from JWT token for mobile logins #413

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
vishwab1 merged 1 commit into from
May 18, 2026
Merged

Remove PII from JWT token for mobile logins #413

Show file tree
Hide file tree
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
9 changes: 6 additions & 3 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 @@ -193,7 +193,10 @@ public String userAuthenticate(
String jwtToken = null;
String refreshToken = null;
if (mUser.size() == 1) {
jwtToken = jwtUtil.generateToken(m_User.getUserName(), mUser.get(0).getUserID().toString());
String userIdStr = mUser.get(0).getUserID().toString();
jwtToken = isMobile
? jwtUtil.generateSecureToken(userIdStr)
: jwtUtil.generateToken(m_User.getUserName(), userIdStr);

User user = new User(); // Assuming the Users class exists
user.setUserID(mUser.get(0).getUserID());
Expand All @@ -209,7 +212,7 @@ public String userAuthenticate(
);

if (isMobile) {
refreshToken = jwtUtil.generateRefreshToken(m_User.getUserName(), user.getUserID().toString());
refreshToken = jwtUtil.generateSecureRefreshToken(user.getUserID().toString());
logger.debug("Refresh token generated successfully for user: {}", user.getUserName());
String jti = jwtUtil.getJtiFromToken(refreshToken);
redisTemplate.opsForValue().set(
Expand Down Expand Up @@ -555,7 +558,7 @@ public String superUserAuthenticate(
);

if (isMobile) {
refreshToken = jwtUtil.generateRefreshToken(m_User.getUserName(), user.getUserID().toString());
refreshToken = jwtUtil.generateSecureRefreshToken(user.getUserID().toString());
logger.debug("Refresh token generated successfully for user: {}", user.getUserName());
String jti = jwtUtil.getJtiFromToken(refreshToken);
redisTemplate.opsForValue().set(
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/com/iemr/common/utils/JwtUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,27 @@ public String generateToken(String username, String userId) {
return buildToken(username, userId, "access", ACCESS_EXPIRATION_TIME);
}

// Mobile login: token without PII in sub
public String generateSecureToken(String userId) {
return buildSecureToken(userId, "access", ACCESS_EXPIRATION_TIME);
}

public String generateSecureRefreshToken(String userId) {
return buildSecureToken(userId, "refresh", REFRESH_EXPIRATION_TIME);
}

private String buildSecureToken(String userId, String tokenType, long expiration) {
return Jwts.builder()
.subject(userId)
.claim("userId", userId)
.claim("token_type", tokenType)
.id(UUID.randomUUID().toString())
.issuedAt(new Date())
.expiration(new Date(System.currentTimeMillis() + expiration))
.signWith(getSigningKey())
.compact();
}

/**
* Generate a refresh token.
*
Expand Down
Loading