Fixing broken tests

Author: danny-gallagher

src/main/java/com/mastercard/developer/encryption/jwe/JWEHeader.java

@@ -1,10 +1,9 @@
 package com.mastercard.developer.encryption.jwe;
 
+import com.jayway.jsonpath.spi.json.JsonProvider;
 import com.mastercard.developer.json.JsonEngine;
 import com.mastercard.developer.utils.EncodingUtils;
 
-import java.util.LinkedHashMap;
-
 public final class JWEHeader {
     private final String enc;
     private final String kid;
@@ -38,12 +37,13 @@ String toJson() {
     }
 
     static JWEHeader parseJweHeader(String encodedHeader, JsonEngine jsonEngine) {
-        LinkedHashMap headerObj = (LinkedHashMap) jsonEngine.parse(new String(EncodingUtils.base64Decode(encodedHeader)));
-        return new JWEHeader(
-                headerObj.get("alg").toString(),
-                headerObj.get("enc").toString(),
-                headerObj.get("kid").toString(),
-                headerObj.get("cty") != null ? headerObj.get("cty").toString() : null);
+        Object headerObj = jsonEngine.parse(new String(EncodingUtils.base64Decode(encodedHeader)));
+        JsonProvider jsonProvider = jsonEngine.getJsonProvider();
+        String alg = jsonProvider.getMapValue(headerObj, "alg").toString();
+        String enc = jsonProvider.getMapValue(headerObj, "enc").toString();
+        String kid = jsonProvider.getMapValue(headerObj, "kid").toString();
+        Object cty = jsonProvider.getMapValue(headerObj, "cty");
+        return new JWEHeader(alg, enc, kid, cty != null ? cty.toString() : null);
     }
 
     String getEnc() { return enc; }

src/main/java/com/mastercard/developer/utils/EncodingUtils.java

@@ -50,14 +50,11 @@ public static byte[] base64Decode(String value) {
         if (null == value) {
             throw new IllegalArgumentException("Can't base64 decode a null value!");
         }
+        value = value.replaceAll("\n", "");
         try {
             return Base64.getDecoder().decode(value);
         } catch (Exception ex) {
-            try {
-                return Base64.getUrlDecoder().decode(value);
-            } catch (Exception e) {
-                return Base64.getMimeDecoder().decode(value);
-            }
+            return Base64.getUrlDecoder().decode(value);
         }
     }