Skip to content

Phase 0b: Upgrade JJWT 0.11.2 → 0.12.6 #163

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

Open
devin-ai-integration wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Phase 0b: Upgrade JJWT 0.11.2 → 0.12.6 #163

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
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@ dependencies {
implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:2.2.2'
implementation 'com.netflix.graphql.dgs:graphql-dgs-spring-boot-starter:4.9.21'
implementation 'org.flywaydb:flyway-core'
implementation 'io.jsonwebtoken:jjwt-api:0.11.2'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.2',
'io.jsonwebtoken:jjwt-jackson:0.11.2'
implementation 'io.jsonwebtoken:jjwt-api:0.12.6'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.6',
'io.jsonwebtoken:jjwt-jackson:0.12.6'
implementation 'joda-time:joda-time:2.10.13'
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'

Expand Down
21 changes: 11 additions & 10 deletions src/main/java/io/spring/infrastructure/service/DefaultJwtService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jws;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import io.spring.core.service.JwtService;
import io.spring.core.user.User;
import java.util.Arrays;
import java.util.Date;
import java.util.Optional;
import javax.crypto.SecretKey;
Expand All @@ -17,32 +17,33 @@
@Component
public class DefaultJwtService implements JwtService {
private final SecretKey signingKey;
private final SignatureAlgorithm signatureAlgorithm;
private int sessionTime;

@Autowired
public DefaultJwtService(
@Value("${jwt.secret}") String secret, @Value("${jwt.sessionTime}") int sessionTime) {
this.sessionTime = sessionTime;
signatureAlgorithm = SignatureAlgorithm.HS512;
this.signingKey = new SecretKeySpec(secret.getBytes(), signatureAlgorithm.getJcaName());
byte[] keyBytes = secret.getBytes();
if (keyBytes.length < 64) {
keyBytes = Arrays.copyOf(keyBytes, 64);
}
this.signingKey = new SecretKeySpec(keyBytes, "HmacSHA512");
}

@Override
public String toToken(User user) {
return Jwts.builder()
.setSubject(user.getId())
.setExpiration(expireTimeFromNow())
.signWith(signingKey)
.subject(user.getId())
.expiration(expireTimeFromNow())
.signWith(signingKey, Jwts.SIG.HS512)
.compact();
}

@Override
public Optional<String> getSubFromToken(String token) {
try {
Jws<Claims> claimsJws =
Jwts.parserBuilder().setSigningKey(signingKey).build().parseClaimsJws(token);
return Optional.ofNullable(claimsJws.getBody().getSubject());
Jws<Claims> claimsJws = Jwts.parser().verifyWith(signingKey).build().parseSignedClaims(token);
return Optional.ofNullable(claimsJws.getPayload().getSubject());
} catch (Exception e) {
return Optional.empty();
}
Expand Down
Loading