From 56df98ce4952239fbf7d0e99dbeb0e5c71531d6f Mon Sep 17 00:00:00 2001
From: sean.zhou <sean.zhou@dji.com>
Date: Fri, 18 Nov 2022 18:29:06 +0800
Subject: [PATCH] initial v1.3.0
---
src/main/java/com/dji/sample/common/util/JwtUtil.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/dji/sample/common/util/JwtUtil.java b/src/main/java/com/dji/sample/common/util/JwtUtil.java
index 629cea1..918f1d7 100644
--- a/src/main/java/com/dji/sample/common/util/JwtUtil.java
+++ b/src/main/java/com/dji/sample/common/util/JwtUtil.java
@@ -2,7 +2,6 @@
import com.auth0.jwt.JWT;
import com.auth0.jwt.JWTCreator;
-import com.auth0.jwt.JWTVerifier;
import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.exceptions.TokenExpiredException;
import com.auth0.jwt.interfaces.DecodedJWT;
@@ -85,14 +84,7 @@
* @throws TokenExpiredException
*/
public static DecodedJWT verifyToken(String token) {
- try {
- JWTVerifier verifier = JWT.require(algorithm).build();
- return verifier.verify(token);
- } catch (Exception e) {
- log.error(e.getMessage());
- e.printStackTrace();
- return null;
- }
+ return JWT.require(algorithm).build().verify(token);
}
/**
@@ -101,7 +93,13 @@
* @return custom claim
*/
public static Optional<CustomClaim> parseToken(String token) {
- DecodedJWT jwt = verifyToken(token);
- return jwt == null ? Optional.empty() : Optional.of(new CustomClaim(jwt.getClaims()));
+ DecodedJWT jwt;
+ try {
+ jwt = verifyToken(token);
+ } catch (Exception e) {
+ e.printStackTrace();
+ return Optional.empty();
+ }
+ return Optional.of(new CustomClaim(jwt.getClaims()));
}
}
--
Gitblit v1.9.3