Handle missing expire date of API token

genepi · Jun 7, 2023 · d434b05 · d434b05
1 parent 05893ad
commit d434b05
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/java/cloudgene/mapred/util/JSONConverter.java b/src/main/java/cloudgene/mapred/util/JSONConverter.java
@@ -25,6 +25,8 @@ public class JSONConverter {
 
 	public static final String MESSAGE_EXPIRED_TOKEN = "API Token was created by %s and expired on %s.";
 
+	public static final String MESSAGE_INVALID_TOKEN = "API Token was created with a previous version and is therefore invalid. Please recreate.";
+
 	public static JSONObject convert(AbstractJob job) {
 
 		JsonConfig config = new JsonConfig();
@@ -233,7 +235,10 @@ public static JSONObject convert(User user) {
 		boolean hasApiToken = user.getApiToken() != null && !user.getApiToken().isEmpty();
 		object.put("hasApiToken", hasApiToken);
 		if (hasApiToken) {
-			if (user.getApiTokenExpiresOn().getTime() > System.currentTimeMillis()) {
+			if (user.getApiTokenExpiresOn() == null) {
+				object.put("apiTokenValid", false);
+				object.put("apiTokenMessage", MESSAGE_INVALID_TOKEN);
+			} else if (user.getApiTokenExpiresOn().getTime() > System.currentTimeMillis()) {
 				object.put("apiTokenValid", true);
 				object.put("apiTokenMessage",
 						String.format(MESSAGE_VALID_TOKEN, user.getUsername(), user.getApiTokenExpiresOn()));