Merge pull request mosip#148 from ase-101/1.3.3

ES-2483 Fix to avoid NPE in IDA when unverifiedConsentedClaims is not present

Author: ckm007

mosip-identity-plugin/src/main/java/io/mosip/esignet/plugin/mosipid/service/IdaAuthenticatorImpl.java

@@ -184,11 +184,7 @@ private void setClaims(VerifiedKycExchangeDto kycExchangeDto, IdaKycExchangeRequ
                 idaKycExchangeRequest.setVerifiedConsentedClaims(verifiedClaimsList);
             }
 
-            Map<String, JsonNode> unVerifiedConsentedClaims = getUnVerifiedConsentedClaims(acceptedClaimDetails);
-            if(!CollectionUtils.isEmpty(unVerifiedConsentedClaims)){
-                Map<String, Object> unVerifiedConsentedClaim = objectMapper.convertValue(unVerifiedConsentedClaims, new TypeReference<>() {});
-                idaKycExchangeRequest.setUnVerifiedConsentedClaims(unVerifiedConsentedClaim);
-            }
+            idaKycExchangeRequest.setUnVerifiedConsentedClaims(getUnVerifiedConsentedClaims(acceptedClaimDetails));
         }
     }
 
@@ -381,7 +377,7 @@ public KycExchangeResult doVerifiedKycExchange(String relyingPartyId, String cli
      * @return un verified consented claims
      */
     @NotNull // This is added to not return null either return un verified claims map or empty map
-    private Map<String, JsonNode> getUnVerifiedConsentedClaims(Map<String, JsonNode> acceptedClaimDetails) {
+    private Map<String, Object> getUnVerifiedConsentedClaims(Map<String, JsonNode> acceptedClaimDetails) {
         Map<String, JsonNode> unVerifiedConsentedClaims = new HashMap<>();
         if(!CollectionUtils.isEmpty(acceptedClaimDetails)) {
             for(Map.Entry<String, JsonNode> entry : acceptedClaimDetails.entrySet()) {
@@ -392,6 +388,6 @@ private Map<String, JsonNode> getUnVerifiedConsentedClaims(Map<String, JsonNode>
                 }
             }
         }
-        return unVerifiedConsentedClaims;
+        return objectMapper.convertValue(unVerifiedConsentedClaims, new TypeReference<>() {});
     }
 }