Skip to content

Update jjwt version #2

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
<version>0.12.5</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
Expand Down
47 changes: 32 additions & 15 deletions src/main/java/com/ons/securitylayerJwt/security/JwtUtilities.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.ons.securitylayerJwt.security;



import io.jsonwebtoken.*;
import io.jsonwebtoken.security.Keys;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
Expand All @@ -19,7 +19,7 @@

@Slf4j
@Component
public class JwtUtilities{
public class JwtUtilities {


@Value("${jwt.secret}")
Expand All @@ -33,32 +33,48 @@ public String extractUsername(String token) {
return extractClaim(token, Claims::getSubject);
}

public Claims extractAllClaims(String token) {return Jwts.parser().setSigningKey(secret).parseClaimsJws(token).getBody();}
public Claims extractAllClaims(String token) {
return Jwts.parser()
.verifyWith(Keys.hmacShaKeyFor(secret.getBytes()))
.build()
.parseSignedClaims(token)
.getPayload();
}

public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
final Claims claims = extractAllClaims(token);
return claimsResolver.apply(claims);
}
public Date extractExpiration(String token) { return extractClaim(token, Claims::getExpiration); }

public Date extractExpiration(String token) {
return extractClaim(token, Claims::getExpiration);
}

public Boolean validateToken(String token, UserDetails userDetails) {
final String email = extractUsername(token);
return (email.equals(userDetails.getUsername()) && !isTokenExpired(token));
}

public Boolean isTokenExpired(String token) {
return extractExpiration(token).before(new Date());
}

public String generateToken(String email , List<String> roles) {

return Jwts.builder().setSubject(email).claim("role",roles).setIssuedAt(new Date(System.currentTimeMillis()))
.setExpiration(Date.from(Instant.now().plus(jwtExpiration, ChronoUnit.MILLIS)))
.signWith(SignatureAlgorithm.HS256, secret).compact();
public String generateToken(String email, List<String> roles) {
return Jwts.builder()
.subject(email)
.claim("role", roles)
.issuedAt(new Date(System.currentTimeMillis()))
.expiration(Date.from(Instant.now().plus(jwtExpiration, ChronoUnit.MILLIS)))
.signWith(Keys.hmacShaKeyFor(secret.getBytes()))
.compact();
}

public boolean validateToken(String token) {
try {
Jwts.parser().setSigningKey(secret).parseClaimsJws(token);
Jwts.parser()
.verifyWith(Keys.hmacShaKeyFor(secret.getBytes()))
.build()
.parseSignedClaims(token);
return true;
} catch (SignatureException e) {
log.info("Invalid JWT signature.");
Expand All @@ -79,11 +95,12 @@ public boolean validateToken(String token) {
return false;
}

public String getToken (HttpServletRequest httpServletRequest) {
final String bearerToken = httpServletRequest.getHeader("Authorization");
if(StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer "))
{return bearerToken.substring(7,bearerToken.length()); } // The part after "Bearer "
return null;
public String getToken(HttpServletRequest httpServletRequest) {
final String bearerToken = httpServletRequest.getHeader("Authorization");
if (StringUtils.hasText(bearerToken) && bearerToken.startsWith("Bearer ")) {
return bearerToken.substring(7, bearerToken.length());
} // The part after "Bearer "
return null;
}

}