[MOSIP-41056] Updated the workflowa

Signed-off-by: pvsaidurga <[email protected]>

Author: pvsaidurga

compass-identity-plugin/pom.xml

@@ -88,12 +88,6 @@
 			<version>${esignet.version}</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.sun.xml.ws</groupId>
-			<artifactId>jaxws-rt</artifactId>
-			<version>2.3.3</version>
-		</dependency>
-
 
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
@@ -123,11 +117,6 @@
 			<version>1.7.30</version>
 			<scope>provided</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.dataformat</groupId>
-			<artifactId>jackson-dataformat-xml</artifactId>
-			<version>2.9.8</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

compass-identity-plugin/src/main/java/io/compass/esignet/plugin/service/HelperService.java

@@ -47,9 +47,6 @@ public class HelperService {
     @Value("${mosip.esignet.compass.authenticator.otp-value:111111}")
     private String otpValue;
 
-    @Value("#{${mosip.esignet.authenticator.compass.identity-openid-claims-mapping}}")
-    private Map<String,String> oidcClaimsMapping;
-
     @Autowired
     private CacheService cacheService;
 
@@ -140,18 +137,62 @@ private String generateB64EncodedHash(String algorithm, String value) throws Kyc
     public Map<String, Object> buildKycDataBasedOnPolicy(List<String> claims, UserInfo userInfo) throws KycExchangeException {
         Map<String, Object> kyc = new HashMap<>();
         for (String claim : claims) {
-            String methodName = oidcClaimsMapping.get(claim);
-
-            if (methodName != null) {
-                try {
-                    Method method = UserInfo.class.getMethod(methodName);
-                    Object value = method.invoke(userInfo);
-                    if (value != null) {
-                        kyc.put(claim, value);
+            switch (claim) {
+                case "name":
+                    if (userInfo.getFirstNamePrimary() != null) {
+                        kyc.put("name", userInfo.getFirstNamePrimary());
                     }
-                } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
-                    throw new KycExchangeException("Error invoking method for claim: "+claim,e.getMessage());
-                }
+                    break;
+                case "birthdate":
+                    if (userInfo.getDateOfBirth() != null) {
+                        kyc.put("birthdate", userInfo.getDateOfBirth());
+                    }
+                    break;
+                case "birthCountry":
+                    if (userInfo.getBirthCountry() != null) {
+                        kyc.put("birthCountry", userInfo.getBirthCountry());
+                    }
+                    break;
+                case "cardAccessNumber":
+                    if (userInfo.getCardAccessNumber() != null) {
+                        kyc.put("cardAccessNumber", userInfo.getCardAccessNumber());
+                    }
+                    break;
+                case "email":
+                    if (userInfo.getEmail() != null) {
+                        kyc.put("email", userInfo.getEmail());
+                    }
+                    break;
+                case "faceImageColor":
+                    if (userInfo.getFaceImageColor() != null) {
+                        kyc.put("faceImageColor", userInfo.getFaceImageColor());
+                    }
+                    break;
+                case "gender":
+                    if (userInfo.getGender() != null) {
+                        kyc.put("gender", userInfo.getGender());
+                    }
+                    break;
+                case "lastNameSecondary":
+                    if (userInfo.getLastNameSecondary() != null) {
+                        kyc.put("lastNameSecondary", userInfo.getLastNameSecondary());
+                    }
+                    break;
+                case "nationalUid":
+                    if (userInfo.getNationalUid() != null) {
+                        kyc.put("nationalUid", userInfo.getNationalUid());
+                    }
+                    break;
+                case "nationality":
+                    if (userInfo.getNationality() != null) {
+                        kyc.put("nationality", userInfo.getNationality());
+                    }
+                    break;
+                case "compassId":
+                    if (userInfo.getCompassId() != null) {
+                        kyc.put("compassId", userInfo.getCompassId());
+                    }
+                    break;
             }
         }
         return kyc;

compass-identity-plugin/src/main/resources/application.properties

@@ -1,8 +1,6 @@
 mosip.compass.generate-challenge.endpoint=http://otpmanager.kernel/v1/otpmanager/otp/generate
 mosip.compass.send-notification.endpoint=http://notifier.kernel/v1/notifier/sms/send
-mosip.compass.user-info.endpoint=
+mosip.compass.user-info.endpoint= https://compass-admin.dev2.mosip.net/v1/admin/userinfo
 mosip.esignet.identifier.prefix=+91
 mosip.esignet.sms-notification-template.encoded-langcodes={'eng'}
-mosip.esignet.default-language=eng
-
-mosip.esignet.authenticator.compass.identity-openid-claims-mapping={'name':'firstNamePrimary','birthdate':'dateOfBirth','birthCountry':'birthCountry','cardAccessNumber':'cardAccessNumber','email':'email','faceImageColor':'faceImageColor','gender':'gender','lastNameSecondary':'lastNameSecondary','nationalUid':'nationalUid','nationality':'nationality','compassId':'compassId'}
+mosip.esignet.default-language=eng