fix build with new jsonwebtoken api
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
2025-03-23 15:16:19 +01:00
parent eced10976b
commit d285783fe7
2 changed files with 13 additions and 14 deletions

View File

@@ -52,12 +52,12 @@
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId> <artifactId>jjwt-impl</artifactId>
<version>0.11.5</version> <version>0.12.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId> <artifactId>jjwt-jackson</artifactId>
<version>0.11.5</version> <version>0.12.6</version>
</dependency> </dependency>
<!-- Database Dependencies --> <!-- Database Dependencies -->

View File

@@ -2,14 +2,13 @@ package wtf.beatrice.releasehive.services;
import io.jsonwebtoken.Claims; import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts; import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.io.Decoders;
import io.jsonwebtoken.security.Keys; import io.jsonwebtoken.security.Keys;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import wtf.beatrice.releasehive.models.User; import wtf.beatrice.releasehive.models.User;
import java.security.Key; import javax.crypto.SecretKey;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -52,11 +51,11 @@ public class JWTService
) { ) {
return Jwts return Jwts
.builder() .builder()
.setClaims(extraClaims) .claims(extraClaims)
.setSubject(userDetails.getEmail()) .subject(userDetails.getEmail())
.setIssuedAt(new Date(System.currentTimeMillis())) .issuedAt(new Date(System.currentTimeMillis()))
.setExpiration(new Date(System.currentTimeMillis() + expiration)) .expiration(new Date(System.currentTimeMillis() + expiration))
.signWith(getSignInKey(), SignatureAlgorithm.HS256) .signWith(getSignInKey(), Jwts.SIG.HS256)
.compact(); .compact();
} }
@@ -75,14 +74,14 @@ public class JWTService
private Claims extractAllClaims(String token) { private Claims extractAllClaims(String token) {
return Jwts return Jwts
.parserBuilder() .parser()
.setSigningKey(getSignInKey()) .verifyWith(getSignInKey())
.build() .build()
.parseClaimsJws(token) .parseSignedClaims(token)
.getBody(); .getPayload();
} }
private Key getSignInKey() { private SecretKey getSignInKey() {
byte[] keyBytes = Decoders.BASE64.decode(secretKey); byte[] keyBytes = Decoders.BASE64.decode(secretKey);
return Keys.hmacShaKeyFor(keyBytes); return Keys.hmacShaKeyFor(keyBytes);
} }