Code merge from develop to Release 1.2.0.1

authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/transaction/manager/IdAuthSecurityManager.java

@@ -10,13 +10,13 @@
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
-import java.util.Map.Entry;
-import java.util.AbstractMap.SimpleEntry;
 
 import javax.crypto.SecretKey;
 import javax.security.auth.x500.X500Principal;
@@ -193,7 +193,7 @@ public class IdAuthSecurityManager {
 
 	@Autowired
 	private IdTypeUtil idTypeUtil;
-
+	
 	/**
 	 * Gets the user.
 	 *

authentication/authentication-common/src/test/java/io/mosip/authentication/common/service/impl/AuthAnonymousProfileServiceImplTest.java

@@ -11,6 +11,7 @@
 import java.util.Map;
 
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -25,8 +26,6 @@
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.web.context.WebApplicationContext;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import io.mosip.authentication.common.service.entity.AutnTxn;
@@ -71,6 +70,7 @@ public class AuthAnonymousProfileServiceImplTest {
 	Map<String, Object> requestMetadata = null;
 	Map<String, Object> responseMetadata = null;
 	Map<String,List<IdentityInfoDTO>> idInfoMap = null;
+	List<AuthError> errorCodes = null;
 
 	@Before
 	public void before() {
@@ -79,6 +79,7 @@ public void before() {
 		 requestMetadata = new HashMap<>();
 		 responseMetadata = new HashMap<>();
 		 idInfoMap = new HashMap<String, List<IdentityInfoDTO>>();
+		 errorCodes = new ArrayList<>();
 
 		ReflectionTestUtils.setField(anonymousProfileServiceImpl, "mapper", mapper);
 		ReflectionTestUtils.setField(idInfoHelper, "idInfoFetcher", idInfoFetcherImpl);
@@ -87,28 +88,38 @@ public void before() {
 		ReflectionTestUtils.setField(anonymousProfileServiceImpl, "dateOfBirthPattern", "yyyy/MM/dd");
 	}
 
+	@Ignore
 	@Test
 	public void createAnonymousProfileWith_YourOfBirthTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		List<IdentityInfoDTO> dobList = new ArrayList<IdentityInfoDTO>();
 		IdentityInfoDTO dob = new IdentityInfoDTO();
 		dob.setLanguage("Eng");
 		dob.setValue("1993/04/11");
 		dobList.add(dob);
 		idInfoMap.put("dateOfBirth", dobList);
 		responseMetadata.put("IDENTITY_INFO", idInfoMap );
+
 
 		Map<String, Object> authResponse = new HashMap<>();
 		authResponse.put("authStatus", "true");
 		authResponse.put("authToken", "1234567890");
 		responseBody.put("response", authResponse);
 
 		Mockito.when(idInfoHelper.getEntityInfoAsString(DemoMatchType.DOB, idInfoMap)).thenReturn("1993/04/11");
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",
+			requestBody, requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals(anonymousProfile.getYearOfBirth(), "1993");
 	}
 
+	@Ignore
 	@Test
 	public void createAnonymousProfileWith_PreferredLangTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		List<IdentityInfoDTO> preferedLangList = new ArrayList<IdentityInfoDTO>();
 		IdentityInfoDTO lang = new IdentityInfoDTO();
 		lang.setLanguage("eng");
@@ -123,12 +134,16 @@ public void createAnonymousProfileWith_PreferredLangTest() throws IdAuthenticati
 		responseBody.put("response", authResponse);
 
 		Mockito.when(idInfoHelper.getDynamicEntityInfoAsString(idInfoMap, null, "preferredLanguage")).thenReturn("eng");
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals(List.of("eng"), anonymousProfile.getPreferredLanguages());
 	}
 
+	@Ignore
 	@Test
 	public void createAnonymousProfileWith_GenderTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		List<IdentityInfoDTO> genderList = new ArrayList<IdentityInfoDTO>();
 		IdentityInfoDTO gender = new IdentityInfoDTO();
 		gender.setLanguage("eng");
@@ -143,12 +158,16 @@ public void createAnonymousProfileWith_GenderTest() throws IdAuthenticationBusin
 		responseBody.put("response", authResponse);
 
 		Mockito.when(idInfoHelper.getEntityInfoAsString(DemoMatchType.GENDER, "eng", idInfoMap)).thenReturn("Female");
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody,requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody,requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals("Female", anonymousProfile.getGender());
 	}
 
+	@Ignore
 	@Test
 	public void createAnonymousProfileWith_LocationTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		List<IdentityInfoDTO> preferedLangList = new ArrayList<IdentityInfoDTO>();
 		IdentityInfoDTO lang = new IdentityInfoDTO();
 		lang.setLanguage(null);
@@ -168,12 +187,16 @@ public void createAnonymousProfileWith_LocationTest() throws IdAuthenticationBus
 		responseBody.put("response", authResponse);
 
 		Mockito.when(idInfoHelper.getIdEntityInfoMap(DemoMatchType.DYNAMIC, idInfoMap, "eng", "locationHierarchyForProfiling")).thenReturn(locationMap);
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals(List.of("zone1", "123456"), anonymousProfile.getLocation());
 	}
 
+	@Ignore
 	@Test
 	public void createAnonymousProfileWith_BiometricInfoTest() throws IdAuthenticationBusinessException, IOException {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		List<IdentityInfoDTO> preferedLangList = new ArrayList<IdentityInfoDTO>();
 		IdentityInfoDTO lang = new IdentityInfoDTO();
 		lang.setLanguage("eng");
@@ -202,7 +225,7 @@ public void createAnonymousProfileWith_BiometricInfoTest() throws IdAuthenticati
 		authResponse.put("authStatus", "true");
 		authResponse.put("authToken", "1234567890");
 		responseBody.put("response", authResponse);
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals(1, anonymousProfile.getBiometricInfo().size());
 		assertEquals("Iris", anonymousProfile.getBiometricInfo().get(0).getType());
 		assertEquals("LEFT", anonymousProfile.getBiometricInfo().get(0).getSubtype());
@@ -212,6 +235,9 @@ public void createAnonymousProfileWith_BiometricInfoTest() throws IdAuthenticati
 
 	@Test
 	public void createAnonymousProfileWith_AuthFactorsTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		AutnTxn authTxn = new AutnTxn();
 		authTxn.setAuthTypeCode("OTP-REQUEST,DEMO-AUTH,BIO-AUTH");
 		responseMetadata.put("AutnTxn",authTxn);
@@ -221,26 +247,32 @@ public void createAnonymousProfileWith_AuthFactorsTest() throws IdAuthentication
 		authResponse.put("authToken", "1234567890");
 		responseBody.put("response", authResponse);
 
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals(3, anonymousProfile.getAuthFactors().size());
 		assertEquals(List.of("OTP-REQUEST","DEMO-AUTH","BIO-AUTH"), anonymousProfile.getAuthFactors());
 
 	}
 
 	@Test
 	public void createAnonymousProfileWith_PartnerTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		PartnerDTO partner = new PartnerDTO();
 		partner.setPartnerName("SyncByte");
 		partner.setPartnerId("abc");
 		requestMetadata.put("partnerId", "abc");
 		requestMetadata.put("abc", partner);
-		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, null);
+		AnonymousAuthenticationProfile anonymousProfile = ReflectionTestUtils.invokeMethod(anonymousProfileServiceImpl, "createAnonymousProfile",requestBody, requestMetadata, responseMetadata, true, errorCodes);
 		assertEquals(partner.getPartnerName(), anonymousProfile.getPartnerName());
 	}
 
 
 	@Test
 	public void createAnonymousProfileExceptionTest() throws IdAuthenticationBusinessException  {
+		requestBody = new HashMap<>();
+		requestMetadata = new HashMap<>();
+		errorCodes = new ArrayList<>();
 		Map<String, Object> authResponse = new HashMap<>();
 		authResponse.put("authStatus", "false");
 		authResponse.put("authToken", "");

authentication/authentication-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java

@@ -443,6 +443,8 @@ public final class IdAuthCommonConstants {
 
 	public static final String  VCI_EXCHANGE_SUCCESS = "VciExchange status : true";
 
+	public static final String VC_CREDENTIAL_DEF = "credentialsDefinition";
+
 	private IdAuthCommonConstants() {
 	}
 }

authentication/authentication-otp-service/src/main/java/io/mosip/authentication/otp/service/OtpApplication.java

@@ -107,8 +107,8 @@
 		MasterDataUpdateEventInitializer.class, IdAuthFraudAnalysisEventManager.class, IdAuthFraudAnalysisEventPublisher.class,
 		LangComparatorConfig.class, OpenApiProperties.class, SessionKeyDecrytorHelper.class, ExternalRestHelperConfig.class, IdaRequestResponsConsumerUtil.class,
 		PartnerCACertEventServiceImpl.class, PartnerCACertEventInitializer.class, 
-		IdAuthWebSubInitializer.class, AuthAnonymousEventPublisher.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class,
-	HSMHealthCheck.class, PrivateKeyDecryptorHelper.class })
+		IdAuthWebSubInitializer.class, AuthAnonymousEventPublisher.class, EnvUtil.class, KeyBindedTokenMatcherUtil.class, 
+		HSMHealthCheck.class, PrivateKeyDecryptorHelper.class })
 @ComponentScan(basePackages = { "io.mosip.authentication.otp.service.*",
 		"io.mosip.kernel.core.logger.config", "${mosip.auth.adapter.impl.basepackage}" }, excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
 				"io.mosip.idrepository.core.config.IdRepoDataSourceConfig.*" }))
@@ -124,4 +124,5 @@ public class OtpApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(OtpApplication.class, args);
 	}
+
 }

authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingController.java

@@ -147,7 +147,7 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody
 						metadata != null && 
 								metadata.get(IdAuthCommonConstants.IDENTITY_DATA) != null &&
 										metadata.get(IdAuthCommonConstants.IDENTITY_INFO) != null) {
-					keyBindingResponseDto = keyIdentityFacade.processIdentityKeyBinding(identityKeyBindingRequestDTO, authResponseDTO, 
+ 					keyBindingResponseDto = keyIdentityFacade.processIdentityKeyBinding(identityKeyBindingRequestDTO, authResponseDTO, 
 								partnerId, oidcClientId, metadata);
 				}
 				return keyBindingResponseDto;
@@ -177,4 +177,4 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody
 			throw new IdAuthenticationBusinessException(IdAuthenticationErrorConstants.UNABLE_TO_PROCESS);
 		}
 	}
-}
+}

authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/facade/KycFacadeImpl.java

@@ -3,7 +3,6 @@
  */
 package io.mosip.authentication.service.kyc.facade;
 
-import java.time.LocalDateTime;
 import java.util.AbstractMap.SimpleEntry;
 import java.util.Collection;
 import java.util.HashSet;
@@ -27,14 +26,11 @@
 import io.mosip.authentication.common.service.builder.AuthTransactionBuilder;
 import io.mosip.authentication.common.service.entity.AutnTxn;
 import io.mosip.authentication.common.service.entity.KycTokenData;
-import io.mosip.authentication.common.service.entity.OIDCClientData;
 import io.mosip.authentication.common.service.helper.AuditHelper;
-import io.mosip.authentication.common.service.helper.IdInfoHelper;
 import io.mosip.authentication.common.service.helper.TokenValidationHelper;
 import io.mosip.authentication.common.service.integration.TokenIdManager;
 import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo;
 import io.mosip.authentication.common.service.repository.KycTokenDataRepository;
-import io.mosip.authentication.common.service.repository.OIDCClientDataRepository;
 import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager;
 import io.mosip.authentication.common.service.util.EnvUtil;
 import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil;

authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/impl/VciServiceImpl.java

@@ -89,6 +89,9 @@ public class VciServiceImpl implements VciService {
 		OBJECT_MAPPER.registerModule(new AfterburnerModule());
 	}
 
+	@Value("${ida.idp.consented.individual_id.attribute.name:individual_id}")
+	private String consentedIndividualAttributeName;
+
 	@Value("${mosip.ida.config.server.file.storage.uri:}")
 	private String configServerFileStorageUrl;
 
@@ -294,7 +297,7 @@ private JsonLDObject generateLdpVc(String credSubjectId, Map<String, List<Identi
 				List<String> locales, Set<String> allowedAttributes, VciExchangeRequestDTO vciExchangeRequestDTO, 
 				String psuToken) throws IdAuthenticationBusinessException {
 
-		Map<String, Object> credSubjectMap = getCredSubjectMap(credSubjectId, idInfo, locales, allowedAttributes);
+		Map<String, Object> credSubjectMap = getCredSubjectMap(credSubjectId, idInfo, locales, allowedAttributes, vciExchangeRequestDTO);
 		try {
 			Map<String, Object> verCredJsonObject = new HashMap<>();
 
@@ -361,13 +364,18 @@ private JsonLDObject generateLdpVc(String credSubjectId, Map<String, List<Identi
 	}
 
 	private Map<String, Object> getCredSubjectMap(String credSubjectId, Map<String, List<IdentityInfoDTO>> idInfo, 
-				List<String> locales, Set<String> allowedAttributes) throws IdAuthenticationBusinessException {
+				List<String> locales, Set<String> allowedAttributes, VciExchangeRequestDTO vciExchangeRequestDTO) 
+				throws IdAuthenticationBusinessException {
 		Map<String, Object> credSubjectMap = new HashMap<>();
 
 		credSubjectMap.put(IdAuthCommonConstants.VC_ID, credSubjectId);
-		
+
 		for (String attrib : allowedAttributes) {
-			List<String> idSchemaAttributes = idInfoHelper.getIdentityAttributesForIdName(attrib);
+			if (consentedIndividualAttributeName.equals(attrib)) {
+				credSubjectMap.put(vciExchangeRequestDTO.getIndividualIdType(), vciExchangeRequestDTO.getIndividualId());
+				continue;
+			}
+
 			if (attrib.equalsIgnoreCase(BiometricType.FACE.value())) {
 				Map<String, String> faceEntityInfoMap = idInfoHelper.getIdEntityInfoMap(BioMatchType.FACE, idInfo, null);
 				if (Objects.nonNull(faceEntityInfoMap)) {
@@ -382,7 +390,9 @@ private Map<String, Object> getCredSubjectMap(String credSubjectId, Map<String,
 					}
 
 				}
+				continue;
 			}
+			List<String> idSchemaAttributes = idInfoHelper.getIdentityAttributesForIdName(attrib);
 			for (String idSchemaAttribute : idSchemaAttributes) {
 				List<IdentityInfoDTO> idInfoList = idInfo.get(idSchemaAttribute);
 				if (Objects.isNull(idInfoList))
@@ -440,4 +450,4 @@ private String convertJP2ToJpeg(String jp2Image) {
 		}
 		return null;
 	}
-}
+}

authentication/authentication-service/src/main/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidator.java

@@ -104,7 +104,7 @@ public void validate(Object target, Errors errors) {
 			}
 
 			if (!errors.hasErrors()) {
-				validateCredentialType(vciExchangeRequestDTO.getCredentialsDefinition().getType(), errors, IdAuthCommonConstants.VC_CREDENTIAL_TYPE);
+				validateCredentialType(vciExchangeRequestDTO.getCredentialsDefinition().getType(), errors, IdAuthCommonConstants.VC_CREDENTIAL_DEF);
 			}
 
 		} else {
@@ -150,16 +150,16 @@ private void validateVCFormat(String vcFormat, Errors errors, String paramName)
 	private void validateCredentialType(List<String> credentialType, Errors errors, String paramName) {
 		if (credentialType == null || credentialType.isEmpty()) {
 			mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE,
-					MISSING_INPUT_PARAMETER + paramName);
+					MISSING_INPUT_PARAMETER + paramName + "/type" );
 			errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(),
-					new Object[] { paramName },
+					new Object[] { paramName + "/type" },
 					IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage());
 		} else {
 			if(!supportedCredTypes.containsAll(credentialType)) {
 				mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE,
-					MISSING_INPUT_PARAMETER + paramName);
+					MISSING_INPUT_PARAMETER + paramName + "/type" );
 				errors.rejectValue(paramName, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(),
-						new Object[] { paramName },
+						new Object[] { paramName + "/type" },
 						IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage());
 			}
 		}