Merge pull request #285 from ase-101/release-0.10.x

ES-842 Corrected the properties and updated the test case accordingly

docker-compose/docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - 8082:8082
     environment:
       - container_user=mosip
-      - active_profile_env=local
+      - active_profile_env=default,local
       - SPRING_DATASOURCE_URL=jdbc:postgresql://database:5432/mosip_mockidentitysystem?currentSchema=mockidentitysystem
       - SPRING_DATASOURCE_USERNAME=postgres
       - SPRING_DATASOURCE_PASSWORD=postgres

docker-compose/mock-relying-party-portal-docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   mock-relying-party-service:
-    image: 'mosipdev/mock-relying-party-service:develop'
+    image: 'mosipdev/mock-relying-party-service:release-0.10.x'
     user: root
     ports:
       - 8888:8888
@@ -14,7 +14,7 @@ services:
 
 
   mock-relying-party-ui:
-    image: 'mosipdev/mock-relying-party-ui:develop'
+    image: 'mosipdev/mock-relying-party-ui:release-0.10.x'
     user: root
     ports:
       - 3000:3000

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/controller/IdentityController.java

@@ -29,7 +29,7 @@ public class IdentityController {
 	@PostMapping(value = "identity", consumes = { MediaType.APPLICATION_JSON_VALUE }, produces = {
 			MediaType.APPLICATION_JSON_VALUE })
 	public ResponseWrapper<IdentityStatus> createIdentity
-	(@Valid @RequestBody RequestWrapper<IdentityData> requestWrapper) throws MockIdentityException {
+	(@Valid @RequestBody RequestWrapper<CreateIdentity> requestWrapper) throws MockIdentityException {
 
 		ResponseWrapper response = new ResponseWrapper<IdentityStatus>();
 		IdentityStatus identityStatus = new IdentityStatus();
@@ -43,7 +43,7 @@ public class IdentityController {
 	@PutMapping(value = "identity", consumes = { MediaType.APPLICATION_JSON_VALUE }, produces = {
 			MediaType.APPLICATION_JSON_VALUE })
 	public ResponseWrapper<IdentityStatus> updateIdentity
-			(@Valid @RequestBody RequestWrapper<IdentityData> requestWrapper) throws MockIdentityException {
+			(@Valid @RequestBody RequestWrapper<UpdateIdentity> requestWrapper) throws MockIdentityException {
 
 		ResponseWrapper response = new ResponseWrapper<IdentityStatus>();
 		IdentityStatus identityStatus = new IdentityStatus();

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/dto/CreateIdentity.java

@@ -0,0 +1,12 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+package io.mosip.esignet.mock.identitysystem.dto;
+
+import io.mosip.esignet.mock.identitysystem.validator.IdData;
+
+@IdData(action = "CREATE")
+public class CreateIdentity extends IdentityData {
+}

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/dto/IdentityData.java

@@ -16,7 +16,6 @@
 import lombok.Data;
 
 @Data
-@IdData
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class IdentityData {
 
@@ -25,8 +24,6 @@ public class IdentityData {
 
 	String pin;
 
-    List<LanguageValue> name;
-
 	List<LanguageValue> fullName;
 
 	String preferredLang;

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/dto/UpdateIdentity.java

@@ -0,0 +1,12 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+package io.mosip.esignet.mock.identitysystem.dto;
+
+import io.mosip.esignet.mock.identitysystem.validator.IdData;
+
+@IdData(action = "UPDATE")
+public class UpdateIdentity extends IdentityData {
+}

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/service/impl/AuthenticationServiceImpl.java

@@ -384,6 +384,7 @@ private KycAuth saveKycAuthTransaction(String transactionId, String relyingParty
     }
 
     private Map<String, Object> buildKycDataBasedOnPolicy(String individualId, JsonNode identityData, Map<String, JsonNode> claims, List<String> locales) {
+        log.info("Accepted claim details {} for locales : {}", claims, locales);
         Map<String, Object> kyc = new HashMap<>();
         if (CollectionUtils.isEmpty(locales)) {
             locales = Arrays.asList(defaultLanguage);
@@ -392,6 +393,7 @@ private Map<String, Object> buildKycDataBasedOnPolicy(String individualId, JsonN
         for (Map.Entry<String, JsonNode> claimDetail : claims.entrySet()) {
 
             Optional<Map.Entry<String, String>> keyMappingEntry = oidcClaimsMapping.entrySet().stream().filter(entry -> entry.getValue().equals(claimDetail.getKey()) ).findFirst();
+            log.info("Mapping for claim {} is found : {}", claimDetail.getKey(), keyMappingEntry.isPresent());
 
             switch (claimDetail.getKey()) {
                 case "verified_claims":

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/validator/IdData.java

@@ -23,4 +23,6 @@
 
 	Class<? extends Payload>[] payload() default {};
 
+	String action() default "CREATE";
+
 }

mock-identity-system/src/main/java/io/mosip/esignet/mock/identitysystem/validator/IdentityDataValidator.java

@@ -23,8 +23,18 @@
 @Component
 public class IdentityDataValidator implements ConstraintValidator<IdData, IdentityData> {
 
-	@Value("#{T(java.util.Arrays).asList('${mosip.esignet.mock.supported-fields:}')}")
-	private List<String> supportedFields;
+	@Value("#{T(java.util.Arrays).asList('${mosip.mock.identity.create.required.fields:}')}")
+	private List<String> createRequiredFields;
+
+	@Value("#{T(java.util.Arrays).asList('${mosip.mock.identity.update.required.fields:}')}")
+	private List<String> updateRequiredFields;
+
+	private String action;
+
+	@Override
+	public void initialize(IdData constraintAnnotation) {
+		this.action = constraintAnnotation.action();
+	}
 
 	@Override
 	public boolean isValid(IdentityData value, ConstraintValidatorContext context) {
@@ -37,7 +47,7 @@ public boolean isValid(IdentityData value, ConstraintValidatorContext context) {
 
 		fields.values().removeIf(Objects::isNull);
 
-		return fields.keySet().containsAll(supportedFields);
+		return fields.keySet().containsAll(this.action.equals("UPDATE") ? updateRequiredFields : createRequiredFields);
 	}
 
 }

mock-identity-system/src/main/resources/application-default.properties

@@ -103,19 +103,23 @@ spring.jpa.hibernate.ddl-auto=none
 spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
 mosip.esignet.mock.authenticator.ida.otp-channels=email,phone
 
-mosip.esignet.mock.supported-fields=individualId,pin,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
-mosip.mock.ida.kba.default.field-language=eng
-mosip.mock.ida.kyc.psut.field=psut
+mosip.mock.identity.create.required.fields=individualId,fullName,givenName,familyName,gender,dateOfBirth,email,phone,streetAddress,locality,region,postalCode,country
+mosip.mock.identity.update.required.fields=individualId
+
 #Related to health check of hsm
 mosip.kernel.keymgr.hsm.health.check.enabled=false
 mosip.kernel.keymgr.hsm.health.key.app-id=MOCK_AUTHENTICATION_SERVICE
 mosip.kernel.keymgr.hsm.healthkey.ref-id=HEALTH_KEY
 
+## Value to be used as partner specific token, if configured value is psut, token is generated using individualId & partnerId. if it is
+# configured to use any other identity fields eg: individualId
+mosip.mock.ida.kyc.psut.field=psut
+
 ##---------------------------------kbi Configurations------------------------------------------------------
 
 #We can use any field from the IdentityData for kbi
 mosip.esignet.authenticator.auth-factor.kbi.field-details={{"id":"phone", "type":"text", "format":""},{"id":"email", "type":"text", "format":""},{"id":"dateOfBirth", "type":"date", "format":"yyyy-MM-dd"}}
 mosip.esignet.authenticator.auth-factor.kbi.field-language=eng
 mosip.mock.ida.kbi.default.field-language=eng
 
-mosip.mock.ida.identity-openid-claims-mapping={"fullName":"name","name":"name","email":"email","phone":"phone_number","gender":"gender","dateOfBirth":"birthdate","encodedPhoto":"picture"}
+mosip.mock.ida.identity-openid-claims-mapping={"fullName":"name","givenName":"given_name","familyName":"family_name","email":"email","phone":"phone_number","gender":"gender","dateOfBirth":"birthdate","encodedPhoto":"picture"}

mock-identity-system/src/main/resources/application-local.properties

@@ -1,76 +1,12 @@
-##----------------------------------------- Database properties --------------------------------------------------------
+##-----------------------------------------local database properties --------------------------------------------------------
 
-spring.datasource.url=jdbc:postgresql://localhost:5455/mosip_mockidentitysystem?currentSchema=mockidentitysystem
-spring.datasource.username=postgres
+mosip.mockidentitysystem.database.hostname=localhost
+mosip.mockidentitysystem.database.port=5455
+mosip.mockidentitysystem.database.name=mosip_mockidentitysystem
+mosip.mockidentitysystem.database.username=postgres
 spring.datasource.password=postgres
-spring.datasource.driver-class-name=org.postgresql.Driver
 
-spring.jpa.database-platform=org.hibernate.dialect.PostgreSQL95Dialect
-spring.jpa.show-sql=false
-spring.jpa.hibernate.ddl-auto=none
-spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=true
-
-#------------------------------------ Key-manager specific properties --------------------------------------------------
-#Crypto asymmetric algorithm name
-mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING
-#Crypto symmetric algorithm name
-mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding
-#Keygenerator asymmetric algorithm name
-mosip.kernel.keygenerator.asymmetric-algorithm-name=RSA
-#Keygenerator symmetric algorithm name
-mosip.kernel.keygenerator.symmetric-algorithm-name=AES
-#Asymmetric algorithm key length
-mosip.kernel.keygenerator.asymmetric-key-length=2048
-#Symmetric algorithm key length
-mosip.kernel.keygenerator.symmetric-key-length=256
-#Encrypted data and encrypted symmetric key separator
-mosip.kernel.data-key-splitter=#KEY_SPLITTER#
-#GCM tag length
-mosip.kernel.crypto.gcm-tag-length=128
-#Hash algo name
-mosip.kernel.crypto.hash-algorithm-name=PBKDF2WithHmacSHA512
-#Symmtric key length used in hash
-mosip.kernel.crypto.hash-symmetric-key-length=256
-#No of iterations in hash
-mosip.kernel.crypto.hash-iteration=100000
-#Sign algo name
-mosip.kernel.crypto.sign-algorithm-name=RS256
-#Certificate Sign algo name
-mosip.kernel.certificate.sign.algorithm=SHA256withRSA
-
-mosip.kernel.keymanager.hsm.config-path=local.p12
+## Keymanager configuration
 mosip.kernel.keymanager.hsm.keystore-type=PKCS12
-mosip.kernel.keymanager.hsm.keystore-pass=local
-
-mosip.kernel.keymanager.certificate.default.common-name=www.mosip.io
-mosip.kernel.keymanager.certificate.default.organizational-unit=MOSIP-TECH-CENTER
-mosip.kernel.keymanager.certificate.default.organization=IITB
-mosip.kernel.keymanager.certificate.default.location=BANGALORE
-mosip.kernel.keymanager.certificate.default.state=KA
-mosip.kernel.keymanager.certificate.default.country=IN
-
-mosip.kernel.keymanager.softhsm.certificate.common-name=www.mosip.io
-mosip.kernel.keymanager.softhsm.certificate.organizational-unit=MOSIP
-mosip.kernel.keymanager.softhsm.certificate.organization=IITB
-mosip.kernel.keymanager.softhsm.certificate.country=IN
-
-# Application Id for PMS master key.
-mosip.kernel.partner.sign.masterkey.application.id=PMS
-mosip.kernel.partner.allowed.domains=DEVICE
-
-mosip.kernel.keymanager-service-validate-url=https://${mosip.hostname}/keymanager/validate
-mosip.kernel.keymanager.jwtsign.validate.json=false
-mosip.keymanager.dao.enabled=false
-crypto.PrependThumbprint.enable=true
-## ------------------------------------------- Integrations ------------------------------------------------------------
-#Mock IDA integration props
-mosip.esignet.mock.authenticator.ida.otp-channels=email,phone
-
-#Mock IDA OIDC Specified Cliams
-mosip.mock.ida.identity-openid-claims-mapping={"fullName":"name","name":"name","email":"email","phone":"phone_number","gender":"gender","dateOfBirth":"birthdate","encodedPhoto":"picture"}
-
-##---------------------------------KBI Configurations------------------------------------------------------
-#We can use any field from the IdentityData for KBI
-mosip.esignet.authenticator.auth-factor.kbi.field-details={{"id":"phone", "type":"text", "format":""},{"id":"email", "type":"text", "format":""},{"id":"dateOfBirth", "type":"date", "format":"yyyy-MM-dd"}}
-mosip.mock.ida.kbi.default.field-language=eng
-mosip.mock.ida.kyc.psut.field=psut
+mosip.kernel.keymanager.hsm.config-path=mock_local.p12
+mosip.kernel.keymanager.hsm.keystore-pass=localtest

mock-identity-system/src/main/resources/bootstrap.properties

@@ -1,8 +1,7 @@
 spring.application.name=mock-identity-system
 #spring.cloud.config.uri=http://localhost:8888
-spring.profiles.active=local
-#spring.cloud.config.label=master
-spring.cloud.config.name=mock-identity-system
+spring.profiles.active=default,local
+
 spring.main.allow-bean-definition-overriding=true
 
 server.port=8082

mock-identity-system/src/test/java/io/mosip/esignet/mock/identitysystem/controller/IdentityControllerTest.java

@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.mosip.esignet.mock.identitysystem.dto.*;
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -69,6 +70,8 @@ public void init() {
 		identityRequest.setPin("1289001");
 		identityRequest.setRegion(Arrays.asList(langValue));
 		identityRequest.setFullName(Arrays.asList(langValue));
+		identityRequest.setGivenName(Arrays.asList(langValue));
+		identityRequest.setFamilyName(Arrays.asList(langValue));
 		identityRequest.setStreetAddress(Arrays.asList(langValue));
 		identityRequest.setPhone("9090909090");
 	}
@@ -100,7 +103,7 @@ public void createIdentity_withInvalidIdentity_returnErrorResponse() throws Exce
 		mockMvc.perform(post("/identity").content(objectMapper.writeValueAsString(requestWrapper))
 				.contentType(MediaType.APPLICATION_JSON)).andExpect(status().isOk())
 				.andExpect(jsonPath("$.errors").isNotEmpty())
-				.andExpect(jsonPath("$.errors[0].errorCode").value(ErrorConstants.INVALID_INDIVIDUAL_ID));
+				.andExpect(jsonPath("$.errors[*].errorCode").value(Matchers.containsInAnyOrder(ErrorConstants.INVALID_REQUEST, ErrorConstants.INVALID_INDIVIDUAL_ID)));
 	}
 
 	@Test

mock-identity-system/src/test/java/io/mosip/esignet/mock/identitysystem/service/impl/AuthenticationServiceImplTest.java

@@ -690,7 +690,7 @@ public void kycExchangeV2_withDetail_thenPass()  {
         LanguageValue languageValueName = new LanguageValue();
         languageValueName.setLanguage("eng");
         languageValueName.setValue("Siddharth K Mansour");
-        identityData.setName(List.of(languageValueName));
+        identityData.setFullName(List.of(languageValueName));
 
 
 
@@ -859,7 +859,7 @@ public void kycExchangeV2_withDetailAndMatchedClaims_thenPass() {
         LanguageValue languageValueName = new LanguageValue();
         languageValueName.setLanguage("eng");
         languageValueName.setValue("Siddharth K Mansour");
-        identityData.setName(List.of(languageValueName));
+        identityData.setFullName(List.of(languageValueName));
 
         // Convert IdentityData to JsonNode
         ObjectMapper objectMapper = new ObjectMapper();
@@ -968,7 +968,7 @@ public void kycExchangeV2_withOutVerifiedClaims_thenPass() throws InvocationTarg
         LanguageValue languageValueName = new LanguageValue();
         languageValueName.setLanguage("eng");
         languageValueName.setValue("Siddharth K Mansour");
-        identityData.setName(List.of(languageValueName));
+        identityData.setFullName(List.of(languageValueName));
 
         KycExchangeRequestDtoV2 kycExchangeRequestDtoV2 = new KycExchangeRequestDtoV2();
         kycExchangeRequestDtoV2.setIndividualId("individualId");
@@ -1090,12 +1090,7 @@ public void kycAuth2_withValidKbiChallenge_thenPass() throws Exception {
         languageValueFullName.setValue("Siddharth K Mansour");
         identityData.setFullName(List.of(languageValueFullName));
 
-        LanguageValue languageValueName = new LanguageValue();
-        languageValueName.setLanguage("eng");
-        languageValueName.setValue("Siddharth");
-        identityData.setName(List.of(languageValueName));
-
-        identityData.setEncodedPhoto("encodedPhoto");
+         identityData.setEncodedPhoto("encodedPhoto");
         identityData.setDateOfBirth("1987/11/25");
         identityData.setEmail("[email protected]");
 
@@ -1160,11 +1155,6 @@ public void kycAuth2_withValidKbiChallenge_and_withOutVerifiedClaim_thenPass() t
         languageValueFullName.setValue("Siddharth K Mansour");
         identityData.setFullName(List.of(languageValueFullName));
 
-        LanguageValue languageValueName = new LanguageValue();
-        languageValueName.setLanguage("eng");
-        languageValueName.setValue("Siddharth");
-        identityData.setName(List.of(languageValueName));
-
         identityData.setEncodedPhoto("encodedPhoto");
         identityData.setDateOfBirth("1987/11/25");
         identityData.setEmail("[email protected]");

mock-identity-system/src/test/java/io/mosip/esignet/mock/identitysystem/validator/ValidatorTest.java

@@ -74,19 +74,43 @@ public void identityDataValidator_withNullValue_thenFail() {
     }
 
     @Test
-    public void identityDataValidator_withSupportedFieldsPresent_thenPass() {
-        List<String> supportedFields = Arrays.asList("name", "email", "phone");
-        ReflectionTestUtils.setField(identityDataValidator, "supportedFields", supportedFields);
+    public void identityDataValidator_withValidInputForCreateAction_thenPass() {
+        List<String> supportedFields = Arrays.asList("fullName", "email", "phone");
+        ReflectionTestUtils.setField(identityDataValidator, "action", "CREATE");
+        ReflectionTestUtils.setField(identityDataValidator, "createRequiredFields", supportedFields);
         IdentityData identityData = new IdentityData();
         LanguageValue languageValue = new LanguageValue();
         languageValue.setLanguage("en");
         languageValue.setValue("John Doe");
 
-        identityData.setName(List.of(languageValue));
+        identityData.setFullName(List.of(languageValue));
         identityData.setEmail("[email protected]");
         identityData.setPhone("1234567890");
+        identityData.setEncodedPhoto("encoded-photo");
 
         assertTrue(identityDataValidator.isValid(identityData, context));
     }
 
+    @Test
+    public void identityDataValidator_withValidInputForUpdateAction_thenPass() {
+        List<String> supportedFields = Arrays.asList("individualId");
+        ReflectionTestUtils.setField(identityDataValidator, "action", "UPDATE");
+        ReflectionTestUtils.setField(identityDataValidator, "updateRequiredFields", supportedFields);
+        IdentityData identityData = new IdentityData();
+        identityData.setIndividualId("individualId");
+
+        assertTrue(identityDataValidator.isValid(identityData, context));
+    }
+
+    @Test
+    public void identityDataValidator_withInvalidInputForUpdateAction_thenFail() {
+        List<String> supportedFields = Arrays.asList("individualId", "email");
+        ReflectionTestUtils.setField(identityDataValidator, "action", "UPDATE");
+        ReflectionTestUtils.setField(identityDataValidator, "updateRequiredFields", supportedFields);
+        IdentityData identityData = new IdentityData();
+        identityData.setIndividualId("individualId");
+
+        assertFalse(identityDataValidator.isValid(identityData, context));
+    }
+
 }