[ES-2158] Fixed bugs reported in sonar (#81) (#83)

* [ES-2158] Fixed bugs reported in sonar



* [ES-2158] Update rwview comments



* [ES-2158] Update rwview comments



* [ES-2158] Update rwview comments



* [ES-2158] Update rwview comments



---------

Signed-off-by: pvsaidurga <saidurgacsea@gmail.com>

Author: pvsaidurga

sunbird-rc-plugin/src/main/java/io/mosip/esignet/plugin/sunbirdrc/service/SunbirdRCAuthenticationService.java

@@ -121,11 +121,14 @@ public KycAuthResult doKycAuth(@NotBlank String relyingPartyId, @NotBlank String
         log.info("Started to build kyc-auth request with transactionId : {} && clientId : {}",
                 kycAuthDto.getTransactionId(), clientId);
         try {
-            for (AuthChallenge authChallenge : kycAuthDto.getChallengeList()) {
-                if(Objects.equals(authChallenge.getAuthFactorType(),"KBI")){
-                    return validateKnowledgeBasedAuth(kycAuthDto.getIndividualId(),authChallenge);
-                }
-                throw new KycAuthException("invalid_challenge_format");
+            Optional<AuthChallenge> optionalAuthChallenge = kycAuthDto.getChallengeList().stream()
+                    .filter(authChallenge -> Objects.equals(authChallenge.getAuthFactorType(), "KBI"))
+                    .findFirst();
+            if (optionalAuthChallenge.isPresent()) {
+                return validateKnowledgeBasedAuth(kycAuthDto.getIndividualId(), optionalAuthChallenge.get());
+            }
+            else{
+                throw new KycAuthException("invalid_challenge_type");
             }
         } catch (KycAuthException e) {
             throw e;
@@ -268,7 +271,7 @@ private KycAuthResult validateKnowledgeBasedAuth(String individualId, AuthChalle
                     new ParameterizedTypeReference<List<Map<String,Object>>>() {});
             if (responseEntity.getStatusCode().is2xxSuccessful() && responseEntity.getBody() != null) {
                 List<Map<String,Object>> responseList = responseEntity.getBody();
-                if(responseList.size()==1){
+                if(responseList != null && responseList.size()==1){
                     //TODO  This need to be removed since it can contain PII
                     log.debug("getting response {}", responseEntity);
                     kycAuthResult.setKycToken((String)responseList.get(0).get(entityIdField));

sunbird-rc-plugin/src/test/java/io/mosip/esignet/plugin/sunbirdrc/service/SunbirdRCAuthenticaionServiceTest.java

@@ -242,7 +242,7 @@ public void doKycAuthWithInValidChallengeType_thenFail() {
             sunbirdRCAuthenticationService.doKycAuth(relyingPartyId, clientId, kycAuthDto);
             Assert.fail();
         }catch (KycAuthException e){
-            Assert.assertEquals(e.getErrorCode(),"invalid_challenge_format");
+            Assert.assertEquals(e.getErrorCode(),"invalid_challenge_type");
         }
     }