diff --git a/WORKSPACE b/WORKSPACE
index 548211b3..57c8af6d 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -41,9 +41,9 @@ maven_install(
"org.postgresql:postgresql:42.6.0",
"org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0",
- "io.jsonwebtoken:jjwt-api:0.11.5",
- "io.jsonwebtoken:jjwt-impl:0.11.5",
- "io.jsonwebtoken:jjwt-jackson:0.11.5",
+ "io.jsonwebtoken:jjwt-api:0.12.2",
+ "io.jsonwebtoken:jjwt-impl:0.12.2",
+ "io.jsonwebtoken:jjwt-jackson:0.12.2",
"commons-codec:commons-codec:1.16.0",
"org.apache.commons:commons-lang3:3.13.0",
"jakarta.xml.bind:jakarta.xml.bind-api:4.0.0",
diff --git a/build.gradle b/build.gradle
index 6b5a8b7d..98e6988e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,9 +44,9 @@ dependencies {
implementation 'org.postgresql:postgresql:42.6.0'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
- implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
- runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
- runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+ implementation 'io.jsonwebtoken:jjwt-api:0.12.2'
+ runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.2'
+ runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.2'
implementation 'commons-codec:commons-codec:1.16.0'
implementation 'org.apache.commons:commons-lang3:3.13.0'
implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
diff --git a/pom.xml b/pom.xml
index f385f598..bd76edb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,8 @@
1.3.70
21
21
- 1.100.2-SNAPSHOT
+ 1.100.6
+ 0.12.2
@@ -77,18 +78,18 @@
io.jsonwebtoken
jjwt-api
- 0.11.5
+ ${jsonwebtoken.version}
io.jsonwebtoken
jjwt-impl
- 0.11.5
+ ${jsonwebtoken.version}
runtime
io.jsonwebtoken
jjwt-jackson
- 0.11.5
+ ${jsonwebtoken.version}
runtime
@@ -207,8 +208,8 @@
true
trye
- https://api.github.com/repos/tomasbjerre/git-changelog-maven-plugin
- ${GITHUB_OAUTH2TOKEN}
+ https://api.github.com/repos/damingerdai/hoteler
+
#([0-9]*)
changelog.mustache
-([^-]+?)$
diff --git a/src/main/angular b/src/main/angular
index 9f605afd..fdab2757 160000
--- a/src/main/angular
+++ b/src/main/angular
@@ -1 +1 @@
-Subproject commit 9f605afd64d993d4fb06206805c9e4c8ec994dbc
+Subproject commit fdab2757cb2979dc8802562d3462f9bf4e38b56d
diff --git a/src/main/java/org/daming/hoteler/utils/JwtUtil.java b/src/main/java/org/daming/hoteler/utils/JwtUtil.java
index 4595f3d8..3663159e 100644
--- a/src/main/java/org/daming/hoteler/utils/JwtUtil.java
+++ b/src/main/java/org/daming/hoteler/utils/JwtUtil.java
@@ -19,19 +19,19 @@ public static String createJWT(String id, String subject, long ttlMillis, Secret
var now = new Date(nowMillis);
var builder = Jwts.builder();
if (Objects.nonNull(claims) && !claims.isEmpty()) {
- builder.setClaims(claims);
+ builder.claims(claims);
}
- builder.setId(id).setIssuedAt(now).setSubject(subject).signWith(secretKey);
+ builder.id(id).issuedAt(now).subject(subject).signWith(secretKey);
if (ttlMillis >= 0L) {
var expMillis = nowMillis + ttlMillis;
var exp = new Date(expMillis);
- builder.setExpiration(exp);
+ builder.expiration(exp);
}
return builder.compact();
}
public static Claims parseJwt(String jwt, SecretKey secretKey) {
- var claim = Jwts.parserBuilder().setSigningKey(secretKey).build().parseClaimsJws(jwt).getBody();
+ var claim = Jwts.parser().verifyWith(secretKey).build().parseSignedClaims(jwt).getPayload();
return claim;
}