[ES-1033] added Verified Claim Detail

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

consent-service-impl/src/main/java/io/mosip/esignet/mapper/converter/ClaimsToStringConverter.java

@@ -7,7 +7,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.core.exception.EsignetException;
 import lombok.extern.slf4j.Slf4j;
 import org.modelmapper.Converter;

consent-service-impl/src/main/java/io/mosip/esignet/mapper/converter/StringToClaimsConverter.java

@@ -7,7 +7,7 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.core.exception.EsignetException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

consent-service-impl/src/test/java/io/mosip/esignet/ConsentServiceImplTest.java

@@ -5,8 +5,8 @@
  */
 package io.mosip.esignet;
 
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.spi.AuditPlugin;
 import io.mosip.esignet.core.dto.UserConsent;
 import io.mosip.esignet.core.dto.UserConsentRequest;

esignet-core/src/main/java/io/mosip/esignet/core/dto/ConsentDetail.java

@@ -5,7 +5,7 @@
  */
 package io.mosip.esignet.core.dto;
 
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import lombok.Data;
 
 import java.time.LocalDateTime;

esignet-core/src/main/java/io/mosip/esignet/core/dto/OAuthDetailRequest.java

@@ -5,7 +5,7 @@
  */
 package io.mosip.esignet.core.dto;
 
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.core.validator.OIDCDisplay;
 import io.mosip.esignet.core.validator.OIDCPrompt;
 import io.mosip.esignet.core.validator.OIDCResponseType;

esignet-core/src/main/java/io/mosip/esignet/core/dto/OIDCTransaction.java

@@ -5,7 +5,7 @@
  */
 package io.mosip.esignet.core.dto;
 
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.util.ConsentAction;
 import io.mosip.esignet.core.util.LinkCodeQueue;
 import lombok.Data;

esignet-core/src/main/java/io/mosip/esignet/core/dto/UserConsent.java

@@ -1,6 +1,6 @@
 package io.mosip.esignet.core.dto;
 
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import lombok.Data;
 
 import java.time.LocalDateTime;

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/AuditDTO.java

@@ -5,6 +5,7 @@
  */
 package io.mosip.esignet.api.dto;
 
+import io.mosip.esignet.api.dto.Claim.Claims;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/ClaimDetail.java → esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/ClaimDetail.java

@@ -3,7 +3,7 @@
  * 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;
+package io.mosip.esignet.api.dto.Claim;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.AllArgsConstructor;

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/ClaimMetadata.java → esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/ClaimMetadata.java

@@ -1,4 +1,4 @@
-package io.mosip.esignet.api.dto;
+package io.mosip.esignet.api.dto.Claim;
 
 import lombok.Data;
 

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claims.java → esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/Claims.java

@@ -3,7 +3,7 @@
  * 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;
+package io.mosip.esignet.api.dto.Claim;
 
 import lombok.Data;
 

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/DocumentDetails.java

@@ -0,0 +1,13 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import lombok.Data;
+
+@Data
+public class DocumentDetails {
+    private FilterCriteria type;
+    private String documentNumber;
+    private String dateOfIssuance;
+    private String dateOfExpiry;
+    private Issuer issuer;
+
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/Evidence.java

@@ -0,0 +1,18 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import io.mosip.esignet.api.util.ErrorConstants;
+import io.mosip.esignet.api.util.EvidenceType;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class Evidence {
+
+        @NotBlank(message = ErrorConstants.INVALID_EVIDENCE_TYPE)
+        private EvidenceType type;
+        private FilterCriteria method;
+        private DocumentDetails documentDetails;
+        private FilterTime time;
+
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/FilterCriteria.java

@@ -0,0 +1,13 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FilterCriteria {
+    private String value;
+    private String[] values;
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/FilterTime.java

@@ -0,0 +1,10 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import lombok.Data;
+
+@Data
+public class FilterTime {
+
+    private int maxAge;
+
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/Issuer.java

@@ -0,0 +1,9 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import lombok.Data;
+
+@Data
+public class Issuer {
+    private String name;
+    private String country;
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/Verification.java

@@ -0,0 +1,18 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import io.mosip.esignet.api.util.ErrorConstants;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+@Data
+public class Verification {
+
+    @NotBlank(message=ErrorConstants.INVALID_TRUST_FRAMEWORK)
+    private FilterCriteria trust_framework;
+    private FilterTime time;
+    private FilterCriteria assurance_level;
+    private List<Evidence> evidence;
+
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/Claim/VerifiedClaimDetail.java

@@ -0,0 +1,16 @@
+package io.mosip.esignet.api.dto.Claim;
+
+import io.mosip.esignet.api.util.ErrorConstants;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class VerifiedClaimDetail {
+
+    @NotBlank
+    private Verification verification;
+
+    @NotBlank(message = ErrorConstants.INVALID_CLAIMS)
+    private Claims claims;
+}

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/KycAuthResult.java

@@ -5,6 +5,7 @@
  */
 package io.mosip.esignet.api.dto;
 
+import io.mosip.esignet.api.dto.Claim.ClaimMetadata;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

esignet-integration-api/src/main/java/io/mosip/esignet/api/dto/VerifiedKycExchangeDto.java

@@ -5,9 +5,9 @@
  */
 package io.mosip.esignet.api.dto;
 
+import io.mosip.esignet.api.dto.Claim.ClaimMetadata;
 import lombok.Data;
 
-import java.util.List;
 import java.util.Map;
 
 @Data

esignet-integration-api/src/main/java/io/mosip/esignet/api/util/ErrorConstants.java

@@ -20,4 +20,7 @@ public class ErrorConstants {
     public static final String VCI_EXCHANGE_FAILED = "vci_exchange_failed";
     public static final String NOT_IMPLEMENTED = "not_implemented";
     public static final String INVALID_CHALLENGE_LENGTH = "invalid_challenge_length";
+    public static final String INVALID_CLAIMS = "invalid_claims";
+    public static final String INVALID_TRUST_FRAMEWORK = "invalid_trust_framework";
+    public static final String INVALID_EVIDENCE_TYPE = "invalid_evidence_type";
 }

esignet-integration-api/src/main/java/io/mosip/esignet/api/util/EvidenceType.java

@@ -0,0 +1,18 @@
+package io.mosip.esignet.api.util;
+
+public enum EvidenceType {
+    DOCUMENT("document"),
+    ELECTRONIC_RECORD("electronic_record"),
+    VOUCH("vouch"),
+    ELECTRONIC_SIGNATURE("electronic_signature");
+    String value;
+
+    EvidenceType(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+}

esignet-service/src/test/java/io/mosip/esignet/flows/AuthCodeFlowTest.java

@@ -18,9 +18,8 @@
 import com.nimbusds.jwt.SignedJWT;
 import io.mosip.esignet.TestUtil;
 import io.mosip.esignet.api.dto.AuthChallenge;
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
-import io.mosip.esignet.api.dto.KycAuthDto;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.spi.AuditPlugin;
 import io.mosip.esignet.api.spi.Authenticator;
 import io.mosip.esignet.core.dto.*;

esignet-service/src/test/java/io/mosip/esignet/flows/AuthorizationAPIFlowTest.java

@@ -18,9 +18,8 @@
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 import io.mosip.esignet.api.dto.AuthChallenge;
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
-import io.mosip.esignet.api.dto.KycAuthDto;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.spi.AuditPlugin;
 import io.mosip.esignet.api.spi.Authenticator;
 import io.mosip.esignet.core.dto.*;

oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationHelperService.java

@@ -6,6 +6,8 @@
 package io.mosip.esignet.services;
 
 import io.mosip.esignet.api.dto.*;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.exception.KycAuthException;
 import io.mosip.esignet.api.exception.SendOtpException;
 import io.mosip.esignet.api.spi.AuditPlugin;

oidc-service-impl/src/main/java/io/mosip/esignet/services/AuthorizationServiceImpl.java

@@ -6,8 +6,8 @@
 package io.mosip.esignet.services;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.dto.KycAuthResult;
 import io.mosip.esignet.api.dto.SendOtpResult;
 import io.mosip.esignet.api.spi.AuditPlugin;

oidc-service-impl/src/main/java/io/mosip/esignet/services/ConsentHelperService.java

@@ -9,8 +9,8 @@
 import com.nimbusds.jose.*;
 import com.nimbusds.jose.crypto.RSASSAVerifier;
 import com.nimbusds.jwt.SignedJWT;
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.spi.AuditPlugin;
 import io.mosip.esignet.api.util.Action;
 import io.mosip.esignet.api.util.ActionStatus;

oidc-service-impl/src/test/java/io/mosip/esignet/services/AuthorizationHelperServiceTest.java

@@ -7,6 +7,8 @@
 
 
 import io.mosip.esignet.api.dto.*;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.exception.KycAuthException;
 import io.mosip.esignet.api.exception.SendOtpException;
 import io.mosip.esignet.api.spi.AuditPlugin;

oidc-service-impl/src/test/java/io/mosip/esignet/services/AuthorizationServiceTest.java

@@ -7,8 +7,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.mosip.esignet.api.dto.AuthChallenge;
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.dto.KycAuthResult;
 import io.mosip.esignet.api.exception.KycAuthException;
 import io.mosip.esignet.api.spi.AuditPlugin;

oidc-service-impl/src/test/java/io/mosip/esignet/services/ConsentHelperServiceTest.java

@@ -10,8 +10,8 @@
 import com.nimbusds.jose.jwk.JWK;
 import com.nimbusds.jose.jwk.JWKSet;
 import com.nimbusds.jose.util.Base64URL;
-import io.mosip.esignet.api.dto.ClaimDetail;
-import io.mosip.esignet.api.dto.Claims;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.spi.AuditPlugin;
 import io.mosip.esignet.api.util.ConsentAction;
 import io.mosip.esignet.core.constants.ErrorConstants;

oidc-service-impl/src/test/java/io/mosip/esignet/services/LinkedAuthorizationServiceTest.java

@@ -7,6 +7,8 @@
 
 
 import io.mosip.esignet.api.dto.*;
+import io.mosip.esignet.api.dto.Claim.ClaimDetail;
+import io.mosip.esignet.api.dto.Claim.Claims;
 import io.mosip.esignet.api.exception.KycAuthException;
 import io.mosip.esignet.api.exception.SendOtpException;
 import io.mosip.esignet.api.spi.AuditPlugin;