From 2d6f36929232dbfbcddfc532cefd5e56207128db Mon Sep 17 00:00:00 2001
From: pvsaidurga <saidurgacsea@gmail.com>
Date: Thu, 16 Jan 2025 20:42:46 +0530
Subject: [PATCH] [ES-1806] Added sub claim and updated pom (#78)

Signed-off-by: pvsaidurga <saidurgacsea@gmail.com>
---
 mock-plugin/pom.xml                                    | 10 +++++-----
 mosip-identity-plugin/pom.xml                          |  4 ++--
 sunbird-rc-plugin/pom.xml                              |  2 +-
 .../service/SunbirdRCAuthenticationService.java        |  3 ++-
 .../src/main/resources/application.properties          |  4 ++--
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/mock-plugin/pom.xml b/mock-plugin/pom.xml
index 5b23842..cf5c9a7 100644
--- a/mock-plugin/pom.xml
+++ b/mock-plugin/pom.xml
@@ -1,5 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
@@ -86,8 +86,8 @@
 		<spring.boot.version>2.3.6.RELEASE</spring.boot.version>
 
 		<kernel-keymanager-service.version>1.2.1.0</kernel-keymanager-service.version>
-		<esignet.version>1.5.0-SNAPSHOT</esignet.version>
-		<esignet-signup.version>1.1.0-SNAPSHOT</esignet-signup.version>
+		<esignet.version>1.5.1-SNAPSHOT</esignet.version>
+		<esignet-signup.version>1.1.1-SNAPSHOT</esignet-signup.version>
 
 		<sonar.exclusions>**/dto/**,**/entity/**,**/exception/**,**/spi/**,**/advice/**,**/config/**</sonar.exclusions>
 		<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
@@ -421,4 +421,4 @@
 		</plugins>
 	</build>
 
-</project>
+</project>
diff --git a/mosip-identity-plugin/pom.xml b/mosip-identity-plugin/pom.xml
index 404dda1..be7c12d 100644
--- a/mosip-identity-plugin/pom.xml
+++ b/mosip-identity-plugin/pom.xml
@@ -86,8 +86,8 @@
 		<spring.boot.version>2.3.6.RELEASE</spring.boot.version>
 
 		<kernel-keymanager-service.version>1.2.1.0</kernel-keymanager-service.version>
-		<esignet.version>1.5.0-SNAPSHOT</esignet.version>
-		<esignet-signup.version>1.1.0-SNAPSHOT</esignet-signup.version>
+		<esignet.version>1.5.1-SNAPSHOT</esignet.version>
+		<esignet-signup.version>1.1.1-SNAPSHOT</esignet-signup.version>
 
 		<sonar.exclusions>**/dto/**,**/entity/**,**/exception/**,**/spi/**,**/advice/**,**/config/**</sonar.exclusions>
 		<sonar.cpd.exclusions>**/dto/**,**/entity/**,**/config/**</sonar.cpd.exclusions>
diff --git a/sunbird-rc-plugin/pom.xml b/sunbird-rc-plugin/pom.xml
index 43087af..4737177 100644
--- a/sunbird-rc-plugin/pom.xml
+++ b/sunbird-rc-plugin/pom.xml
@@ -47,7 +47,7 @@
 		<git-commit-id-plugin.version>3.0.1</git-commit-id-plugin.version>
 		<maven.jacoco.version>0.8.5</maven.jacoco.version>
 		<maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
-		<esignet.version>1.5.0-SNAPSHOT</esignet.version>
+		<esignet.version>1.5.1-SNAPSHOT</esignet.version>
 	</properties>
 	<dependencies>
 	
diff --git a/sunbird-rc-plugin/src/main/java/io/mosip/esignet/plugin/sunbirdrc/service/SunbirdRCAuthenticationService.java b/sunbird-rc-plugin/src/main/java/io/mosip/esignet/plugin/sunbirdrc/service/SunbirdRCAuthenticationService.java
index b5c215e..bc9f5ee 100644
--- a/sunbird-rc-plugin/src/main/java/io/mosip/esignet/plugin/sunbirdrc/service/SunbirdRCAuthenticationService.java
+++ b/sunbird-rc-plugin/src/main/java/io/mosip/esignet/plugin/sunbirdrc/service/SunbirdRCAuthenticationService.java
@@ -73,7 +73,7 @@ public class SunbirdRCAuthenticationService implements Authenticator {
     @Value("${mosip.esignet.authenticator.sunbird-rc.registry-get-url}")
     private String registryUrl;
 
-    @Value("#{${mosip.esignt.authenticator.sunbird-rc.identity-openid-claims-mapping}}")
+    @Value("#{${mosip.esignet.authenticator.sunbird-rc.identity-openid-claims-mapping}}")
     private Map<String,String> oidcClaimsMapping;
 
     @Autowired
@@ -153,6 +153,7 @@ public KycExchangeResult doKycExchange(String relyingPartyId, String clientId, K
             }
             Map<String, Object> kyc = buildKycDataBasedOnPolicy(responseRegistryMap,
                     kycExchangeDto.getAcceptedClaims(), kycExchangeDto.getClaimsLocales());
+            kyc.put("sub", kycExchangeDto.getIndividualId());
             String finalKyc = this.encryptKyc ? getJWE(relyingPartyId, signKyc(kyc)) : signKyc(kyc);
             KycExchangeResult kycExchangeResult = new KycExchangeResult();
             kycExchangeResult.setEncryptedKyc(finalKyc);
diff --git a/sunbird-rc-plugin/src/main/resources/application.properties b/sunbird-rc-plugin/src/main/resources/application.properties
index a8fb03a..fce3695 100644
--- a/sunbird-rc-plugin/src/main/resources/application.properties
+++ b/sunbird-rc-plugin/src/main/resources/application.properties
@@ -10,6 +10,6 @@ mosip.esignet.authenticator.sunbird-rc.auth-factor.kbi.registry-search-url=https
 mosip.esignet.authenticator.sunbird-rc.kbi.entity-id-field=osid
 
 ## The mapping where the key represents the OIDC claim, and the value represents the corresponding claim from the Sunbird registry.
-mosip.sunbird.identity-openid-claims-mapping={"fullName":"fullName","name":"fullName","email":"email","phone":"mobile","gender":"gender","dateOfBirth":"dob","birthdate":"dob"}
+mosip.esignet.authenticator.sunbird-rc.identity-openid-claims-mapping={"fullName":"fullName","name":"fullName","email":"email","phone":"mobile","gender":"gender","dateOfBirth":"dob","birthdate":"dob"}
 
-mosip.esignet.sunbird-rc.registry-get-url=https://registry.dev1.mosip.net/api/v1/Insurance/
+mosip.esignet.authenticator.sunbird-rc.registry-get-url=https://registry.dev1.mosip.net/api/v1/Insurance/