From 1827be9d728d3491c99da92e109a0ee11c69125d Mon Sep 17 00:00:00 2001
From: ase-101 <sunkadaeanusha@gmail.com>
Date: Thu, 23 May 2024 17:29:36 +0530
Subject: [PATCH] ES-1043

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
---
 .../io/mosip/esignet/api/dto/KycAuthDto.java  |  8 -------
 .../mosip/esignet/api/dto/KycAuthResult.java  |  4 ++++
 .../api/dto/VerifiedKycExchangeDto.java       | 17 ++++++++++++++
 .../mosip/esignet/api/spi/Authenticator.java  | 22 ++++++++++++++++---
 .../esignet/TestAuthenticationService.java    |  9 ++++++--
 5 files changed, 47 insertions(+), 13 deletions(-)
 create mode 100644 esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/VerifiedKycExchangeDto.java

diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthDto.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthDto.java
index ce7b80332..f49005eb2 100644
--- a/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthDto.java
+++ b/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthDto.java
@@ -21,12 +21,4 @@ public class KycAuthDto {
     private String individualId;
 
     private List<AuthChallenge> challengeList;
-
-    private boolean claimMetadataRequired;
-
-    public KycAuthDto(String transactionId, String individualId, List<AuthChallenge> challengeList) {
-        this.transactionId = transactionId;
-        this.individualId = individualId;
-        this.challengeList = challengeList;
-    }
 }
diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthResult.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthResult.java
index 29547fe2e..9ce08f35b 100644
--- a/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthResult.java
+++ b/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthResult.java
@@ -9,6 +9,9 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+import java.util.Map;
+
 
 @Data
 @AllArgsConstructor
@@ -17,4 +20,5 @@ public class KycAuthResult {
 
     private String kycToken;
     private String partnerSpecificUserToken;
+    private Map<String, List<ClaimMetadata>> claimsMetadata;
 }
diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/VerifiedKycExchangeDto.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/VerifiedKycExchangeDto.java
new file mode 100644
index 000000000..34a19e1fc
--- /dev/null
+++ b/esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/VerifiedKycExchangeDto.java
@@ -0,0 +1,17 @@
+/*
+ * 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.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class VerifiedKycExchangeDto extends KycExchangeDto  {
+
+    private Map<String, ClaimMetadata> acceptedVerifiedClaims;
+}
diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/spi/Authenticator.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/spi/Authenticator.java
index b4524859c..d8a76d3e9 100644
--- a/esignet-integration-api/src/main/java/io/mosip/esignet/api/spi/Authenticator.java
+++ b/esignet-integration-api/src/main/java/io/mosip/esignet/api/spi/Authenticator.java
@@ -62,9 +62,25 @@ SendOtpResult sendOtp(String relyingPartyId, String clientId, SendOtpDto sendOtp
     List<KycSigningCertificateData> getAllKycSigningCertificates() throws KycSigningCertificateException;
 
     /**
-     * Fetch claims metadata
-     * @param kycToken
+     * Authenticate and return individual's claims metadata if requested
+     * @param relyingPartyId
+     * @param clientId
+     * @param claimsMetadataRequired
+     * @param kycAuthDto
+     * @return
+     * @throws KycAuthException
+     */
+    KycAuthResult doKycAuth(String relyingPartyId, String clientId, boolean claimsMetadataRequired, KycAuthDto kycAuthDto)
+            throws KycAuthException;
+
+    /**
+     * Providioned to return verified userinfo based on the provided verification requirement
+     * @param relyingPartyId
+     * @param clientId
+     * @param kycExchangeDto
      * @return
+     * @throws KycExchangeException
      */
-    Map<String, List<ClaimMetadata>> getClaimMetadata(String partnerSpecificUserToken, String kycToken);
+    KycExchangeResult doVerifiedKycExchange(String relyingPartyId, String clientId, VerifiedKycExchangeDto kycExchangeDto)
+            throws KycExchangeException;
 }
diff --git a/esignet-service/src/test/java/io/mosip/esignet/TestAuthenticationService.java b/esignet-service/src/test/java/io/mosip/esignet/TestAuthenticationService.java
index b9668cdbc..1caa9cae6 100644
--- a/esignet-service/src/test/java/io/mosip/esignet/TestAuthenticationService.java
+++ b/esignet-service/src/test/java/io/mosip/esignet/TestAuthenticationService.java
@@ -316,8 +316,13 @@ public List<KycSigningCertificateData> getAllKycSigningCertificates() {
     }
 
     @Override
-    public Map<String, List<ClaimMetadata>> getClaimMetadata(String partnerSpecificUserToken, String kycToken) {
-        return Map.of();
+    public KycAuthResult doKycAuth(String relyingPartyId, String clientId, boolean claimsMetadataRequired, KycAuthDto kycAuthDto) throws KycAuthException {
+        return null;
+    }
+
+    @Override
+    public KycExchangeResult doVerifiedKycExchange(String relyingPartyId, String clientId, VerifiedKycExchangeDto kycExchangeDto) throws KycExchangeException {
+        return null;
     }
 
     private boolean authenticateUser(String transactionId, String individualId, AuthChallenge authChallenge) {