Merge pull request #20 from Bahmni-Covid19/327-redirect-on-login

327 | Resolves redirection issue after login
BahmniIndiaDistro · Nov 19, 2021 · 824baa2 · 824baa2
2 parents 31af760 + b9d11f0
commit 824baa2
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/in/org/projecteka/hiu/user/JWTGenerator.java b/src/main/java/in/org/projecteka/hiu/user/JWTGenerator.java
@@ -12,6 +12,7 @@
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
 
 import static in.org.projecteka.hiu.common.Constants.IST;
@@ -28,7 +29,7 @@ public String tokenFrom(User user) {
                 .claim("username", user.getUsername())
                 .claim("role", user.getRole())
                 .claim("isVerified", user.isVerified())
-                .claim("exp", LocalDateTime.now().plus(1, ChronoUnit.HOURS).atZone(ZoneId.of(IST)).toInstant().toEpochMilli())
+                .claim("exp", ZonedDateTime.of(LocalDateTime.now(ZoneId.of(IST)), ZoneId.systemDefault()).plus(1, ChronoUnit.HOURS).toInstant().toEpochMilli())
                 .build();
         JWSObject jwsObject = new JWSObject(new JWSHeader(JWSAlgorithm.HS256), new Payload(claims.toJSONObject()));
         jwsObject.sign(signer);