|
|
@@ -30,13 +30,11 @@ public class JwtTokenUtil implements Serializable {
|
|
|
static final String CLAIM_KEY_CREATED = "iat";
|
|
|
|
|
|
@SuppressFBWarnings(value = "SE_BAD_FIELD", justification = "It's okay here")
|
|
|
- private Clock clock = DefaultClock.INSTANCE;
|
|
|
- private JwtConfig jwtConfig;
|
|
|
- private CacheManager cacheManager;
|
|
|
+ private Clock clock = DefaultClock.INSTANCE;
|
|
|
+ private JwtConfig jwtConfig;
|
|
|
|
|
|
- public JwtTokenUtil(JwtConfig jwtConfig, CacheManager cacheManager) {
|
|
|
+ public JwtTokenUtil(JwtConfig jwtConfig) {
|
|
|
this.jwtConfig = jwtConfig;
|
|
|
- this.cacheManager = cacheManager;
|
|
|
}
|
|
|
|
|
|
public String getUsernameFromToken(String token) {
|
|
|
@@ -79,11 +77,7 @@ public class JwtTokenUtil implements Serializable {
|
|
|
|
|
|
public String generateToken(UserDetails userDetails) {
|
|
|
Map<String, Object> claims = new HashMap<>();
|
|
|
- String token = doGenerateToken(claims, userDetails.getUsername());
|
|
|
- Cache cache = cacheManager.getCache("token");
|
|
|
- cache.evict(userDetails.getUsername());
|
|
|
- cache.put(userDetails.getUsername(), token);
|
|
|
- return token;
|
|
|
+ return doGenerateToken(claims, userDetails.getUsername());
|
|
|
}
|
|
|
|
|
|
private String doGenerateToken(Map<String, Object> claims, String subject) {
|
|
|
@@ -120,10 +114,6 @@ public class JwtTokenUtil implements Serializable {
|
|
|
}
|
|
|
|
|
|
public Boolean validateToken(String token, UserDetails userDetails) {
|
|
|
- String tokenCache = cacheManager.getCache("token").get(userDetails.getUsername(), String.class);
|
|
|
- if (StringUtils.isEmpty(tokenCache) || !token.equals(tokenCache)) {
|
|
|
- return false;
|
|
|
- }
|
|
|
JwtUser user = (JwtUser) userDetails;
|
|
|
final String username = getUsernameFromToken(token);
|
|
|
final Date created = getIssuedAtDateFromToken(token);
|