Merge pull request #104 from topcoder-platform/hotfix/RS256-token

Hotfix DEV - RS256 token decoding issue

Author: sachin-maheshwari

.circleci/config.yml

@@ -96,7 +96,7 @@ workflows:
           context : org-global      
           filters:
             branches:
-              only: [dev-circleci2, dev]
+              only: [dev, 'hotfix/RS256-token']
       - build-prod:
           context : org-global      
           filters:

src/java/main/com/cronos/onlinereview/util/JwtTokenUpdater.java

@@ -20,7 +20,7 @@
 import java.util.Date;
 
 import org.apache.struts2.ServletActionContext;
-import org.apache.xerces.utils.Base64;
+import org.apache.commons.codec.binary.Base64;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -101,12 +101,13 @@ public JwtTokenUpdater check() throws Exception {
         	if (tokenSplit.length <= 1) {
         		valid = false;
         	} else {
-        		StringBuffer payloadStr = new StringBuffer(tokenSplit[1]);
-                while (payloadStr.length() % 4 != 0) {
+        		//StringBuffer payloadStr = new StringBuffer(tokenSplit[1]);
+                /*while (payloadStr.length() % 4 != 0) {
                 	payloadStr.append('=');
-                }
-                
-                String payload = new String(Base64.decode(payloadStr.toString().getBytes(StandardCharsets.UTF_8)));
+                }*/
+                //String payload = new String(Base64.decode(payloadStr.toString().getBytes(StandardCharsets.UTF_8)));
+
+                String payload = new String(Base64.decodeBase64(tokenSplit[1]), "UTF-8");
                 JsonNode jsonNode = objectMapper.readValue(payload.toString(), JsonNode.class);
 
                 long exp = jsonNode.get("exp").asLong();