From 20043509e81778039b8f6eb022a924acde3fe754 Mon Sep 17 00:00:00 2001 From: Tucker Siegel <tgsiegel@terpmail.umd.edu> Date: Tue, 18 Apr 2023 12:16:16 -0400 Subject: [PATCH] update --- .../java/edu/umd/dawn/common/jwt/JWTUtil.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/umd/dawn/common/jwt/JWTUtil.java b/src/main/java/edu/umd/dawn/common/jwt/JWTUtil.java index c256510..45fbae8 100644 --- a/src/main/java/edu/umd/dawn/common/jwt/JWTUtil.java +++ b/src/main/java/edu/umd/dawn/common/jwt/JWTUtil.java @@ -51,10 +51,11 @@ public class JWTUtil { } } - private String create(Claims claims, int expMin) { + private String create(Claims claims, LocalDateTime expiration) { try { String token = claims.fill(JWT.create() - .withIssuer("dawn")).withExpiresAt(LocalDateTime.now().plus(expMin, ChronoUnit.MINUTES).toInstant(ZoneOffset.UTC)).sign(algorithm); + .withIssuer("dawn")).withExpiresAt(expiration.toInstant(ZoneOffset.UTC)).sign(algorithm); + // .withIssuer("dawn")).withExpiresAt().sign(algorithm); return token; } catch (Exception e) { throw new DawnException(BaseExceptions.INVALID_JWT, e); @@ -71,16 +72,16 @@ public class JWTUtil { public static String issue(String accessSecret, Claims claims) { JWTUtil util = new JWTUtil(accessSecret); - return util.create(claims, 20); // eventually move 20 to be a variable + return util.create(claims, LocalDateTime.now().plus(20, ChronoUnit.MINUTES)); // eventually move 20 to be a variable } - public static String issue(String accessSecret, Claims claims, int expTime) { + public static String issue(String accessSecret, Claims claims, LocalDateTime expiration) { JWTUtil util = new JWTUtil(accessSecret); - return util.create(claims, expTime); + return util.create(claims, expiration); } - public static String issue(String accessSecret, User user, int expTime) { + public static String issue(String accessSecret, User user, LocalDateTime expiration) { JWTUtil util = new JWTUtil(accessSecret); - return util.create(Claims.fromUser(user), expTime); + return util.create(Claims.fromUser(user), expiration); } } -- GitLab