Merge branch 'aiccra-staging' into aiccra-dev

Author: kenjitm

marlo-web/src/main/java/org/cgiar/ccafs/marlo/action/json/superadmin/TipGetTokenServiceAction.java

@@ -96,7 +96,14 @@ public String execute() throws Exception {
           token = jsonResponse.getString("token");
           SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
-          Date dueDate = dateFormat.parse(jsonResponse.getString("due_date"));
+          Date dueDate = null;
+          if (jsonResponse.has("due_date")) {
+            dueDate = dateFormat.parse(jsonResponse.getString("due_date"));
+          }
+
+          if (jsonResponse.has("updated_at")) {
+            dueDate = dateFormat.parse(jsonResponse.getString("updated_at"));
+          }
 
           // Save token in DB
           if (token != null && !token.isEmpty()) {

marlo-web/src/main/resources/custom/aicrra.properties

@@ -5337,6 +5337,7 @@ tipParameter.tipStatusService= Status Service Endpoint
 tipParameter.tokenValue= Token Value
 tipParameter.updateToken= Update Token
 tipParameter.tokenDueDate= Token Due Date
+tipParameter.tipEncryptionKey= Encryption Key
 
 #pop-up guide
 login.popup.title=Login