Skip to content
Open
Changes from all commits
Commits
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
23 changes: 9 additions & 14 deletions src/main/java/net/engineeringdigest/journalApp/utilis/JwtUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
@Component
public class JwtUtil {

private String SECRET_KEY = "TaK+HaV^uvCHEFsEVfypW#7g9^k*Z8$V";

private SecretKey getSigningKey() {
String SECRET_KEY = "TaK+HaV^uvCHEFsEVfypW#7g9^k*Z8$V";
return Keys.hmacShaKeyFor(SECRET_KEY.getBytes());
}

Expand All @@ -29,10 +28,9 @@ public Date extractExpiration(String token) {

private Claims extractAllClaims(String token) {
return Jwts.parser()
.verifyWith(getSigningKey())
.build()
.parseSignedClaims(token)
.getPayload();
.setSigningKey(getSigningKey()) // Use setSigningKey instead of verifyWith
.parseClaimsJws(token) // Use parseClaimsJws instead of parseSignedClaims
.getBody(); // Use getBody to access claims from the parsed token
}

private Boolean isTokenExpired(String token) {
Expand All @@ -46,19 +44,16 @@ public String generateToken(String username) {

private String createToken(Map<String, Object> claims, String subject) {
return Jwts.builder()
.claims(claims)
.subject(subject)
.header().empty().add("typ","JWT")
.and()
.issuedAt(new Date(System.currentTimeMillis()))
.expiration(new Date(System.currentTimeMillis() + 1000 * 60 * 50)) // 5 minutes expiration time
.setClaims(claims) // Use setClaims() to add claims to the builder
.setSubject(subject)
.setHeaderParam("typ", "JWT")
.setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 50))
.signWith(getSigningKey())
.compact();
}

public Boolean validateToken(String token) {
return !isTokenExpired(token);
}


}