Skip to content

Commit f332c50

Browse files
committed
fix: remove deprecated methods, add null check for jti
1 parent e3eb3a3 commit f332c50

2 files changed

Lines changed: 8 additions & 18 deletions

File tree

src/main/java/com/iemr/tm/utils/JwtUtil.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package com.iemr.tm.utils;
22

3-
import java.util.Date;
43
import java.util.function.Function;
5-
64
import javax.crypto.SecretKey;
75

86
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,15 +32,15 @@ private SecretKey getSigningKey() {
3432
public Claims validateToken(String token) {
3533
try {
3634
Claims claims = Jwts.parser()
37-
.setSigningKey(getSigningKey())
35+
.verifyWith(getSigningKey())
3836
.build()
39-
.parseClaimsJws(token)
40-
.getBody();
37+
.parseSignedClaims(token)
38+
.getPayload();
4139

4240
String jti = claims.getId();
4341

44-
// Check if token is denylisted
45-
if (tokenDenylist.isTokenDenylisted(jti)) {
42+
// Check if token is denylisted (only if jti exists)
43+
if (jti != null && tokenDenylist.isTokenDenylisted(jti)) {
4644
return null;
4745
}
4846

@@ -63,9 +61,9 @@ public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
6361

6462
private Claims extractAllClaims(String token) {
6563
return Jwts.parser()
66-
.setSigningKey(getSigningKey())
64+
.verifyWith(getSigningKey())
6765
.build()
68-
.parseClaimsJws(token)
69-
.getBody();
66+
.parseSignedClaims(token)
67+
.getPayload();
7068
}
7169
}

src/main/java/com/iemr/tm/utils/TokenDenylist.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,4 @@ public boolean isTokenDenylisted(String jti) {
5252
return false;
5353
}
5454
}
55-
56-
// Remove a token's jti from the denylist (Redis)
57-
public void removeTokenFromDenylist(String jti) {
58-
if (jti != null && !jti.trim().isEmpty()) {
59-
String key = getKey(jti); // Use helper method to get the key
60-
redisTemplate.delete(key);
61-
}
62-
}
6355
}

0 commit comments

Comments
 (0)