Infosys
diff --git a/‎.gitignore‎
Lines changed: 2 additions & 1 deletion b/‎.gitignore‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎certify-core/pom.xml‎
Lines changed: 2 additions & 2 deletions b/‎certify-core/pom.xml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/config/RedisCacheConfig.java‎
Lines changed: 13 additions & 3 deletions b/‎certify-core/src/main/java/io/mosip/certify/core/config/RedisCacheConfig.java‎
Lines changed: 13 additions & 3 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/constants/Constants.java‎
Lines changed: 6 additions & 1 deletion b/‎certify-core/src/main/java/io/mosip/certify/core/constants/Constants.java‎
Lines changed: 6 additions & 1 deletion
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/constants/VCDM2Constants.java‎
Lines changed: 1 addition & 0 deletions b/‎certify-core/src/main/java/io/mosip/certify/core/constants/VCDM2Constants.java‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/constants/VCFormats.java‎
Lines changed: 1 addition & 2 deletions b/‎certify-core/src/main/java/io/mosip/certify/core/constants/VCFormats.java‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/dto/CertificateResponseDTO.java‎
Lines changed: 13 additions & 0 deletions b/‎certify-core/src/main/java/io/mosip/certify/core/dto/CertificateResponseDTO.java‎
Lines changed: 13 additions & 0 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/dto/ClaimsDisplayFieldsConfigDTO.java‎
Lines changed: 23 additions & 0 deletions b/‎certify-core/src/main/java/io/mosip/certify/core/dto/ClaimsDisplayFieldsConfigDTO.java‎
Lines changed: 23 additions & 0 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/dto/CredentialConfigurationDTO.java‎
Lines changed: 14 additions & 21 deletions b/‎certify-core/src/main/java/io/mosip/certify/core/dto/CredentialConfigurationDTO.java‎
Lines changed: 14 additions & 21 deletions
diff --git a/‎certify-core/src/main/java/io/mosip/certify/core/dto/CredentialConfigurationSupportedDTO.java‎
Lines changed: 1 addition & 1 deletion b/‎certify-core/src/main/java/io/mosip/certify/core/dto/CredentialConfigurationSupportedDTO.java‎
Lines changed: 1 addition & 1 deletion
@@ -29,4 +29,5 @@ target/
 .mvn/
 .project/
 helm/*/Chart.lock
-helm/*/charts/
+helm/*/charts/
+.DS_Store
@@ -16,7 +16,7 @@
     <groupId>io.mosip.certify</groupId>
     <artifactId>certify-core</artifactId>
     <name>certify-core</name>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>${project.parent.version}</version>
     <description>Certify Core Library</description>
 
     <dependencies>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>io.mosip.certify</groupId>
             <artifactId>certify-integration-api</artifactId>
-            <version>0.12.0-SNAPSHOT</version>
+            <version>${project.parent.version}</version>
         </dependency>
         <dependency>
             <groupId>com.h2database</groupId>
 
@@ -5,6 +5,7 @@
  */
 package io.mosip.certify.core.config;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -19,20 +20,29 @@
 
 @ConditionalOnProperty(value = "spring.cache.type", havingValue = "redis")
 @Configuration
+@Slf4j
 public class RedisCacheConfig {
 
     @Value("#{${mosip.certify.cache.expire-in-seconds}}")
     private Map<String, Integer> cacheNamesWithTTLMap;
 
+    @Value("${mosip.certify.cache.redis.key-prefix:}")
+    private String cachePrefix;
+
     @Bean
     public RedisCacheManagerBuilderCustomizer redisCacheManagerBuilderCustomizer() {
         return (builder) -> {
             Map<String, RedisCacheConfiguration> configurationMap = new HashMap<>();
             cacheNamesWithTTLMap.forEach((cacheName, ttl) -> {
-                configurationMap.put(cacheName, RedisCacheConfiguration
+                RedisCacheConfiguration defaultConfiguration = RedisCacheConfiguration
                                 .defaultCacheConfig()
-                                    .disableCachingNullValues()
-                                    .entryTtl(Duration.ofSeconds(ttl)));
+                                .disableCachingNullValues()
+                                .entryTtl(Duration.ofSeconds(ttl));
+                if (cachePrefix != null && !cachePrefix.isEmpty()) {
+                    log.info("Using cache prefix: {}", cachePrefix);
+                    defaultConfiguration = defaultConfiguration.prefixCacheNameWith(cachePrefix);
+                }
+                configurationMap.put(cacheName, defaultConfiguration);
             });
             builder.withInitialCacheConfigurations(configurationMap);
         };
 
@@ -25,7 +25,7 @@ public class Constants {
     public static final String EMPTY_REF_ID = "";
     public static final String ED25519_REF_ID = "ED25519_SIGN";
     public static final String TEMPLATE_NAME = "templateName";
-    public static final String ISSUER_URI = "issuerURI";
+    public static final String DID_URL = "didUrl";
     public static final String RENDERING_TEMPLATE_ID = "renderingTemplateId";
     public static final String CERTIFY_VC_SIGN_EC_K1 = "CERTIFY_VC_SIGN_EC_K1";
     public static final String CERTIFY_VC_SIGN_EC_R1 = "CERTIFY_VC_SIGN_EC_R1";
@@ -34,4 +34,9 @@ public class Constants {
     public static final String ACTIVE = "active";
     public static final String INACTIVE = "inactive";
     public static final String DELIMITER = "::";  // delimiter is ::  its not used by url or within any context of VC name and is distinct
+    public  static final String SIGNATURE_CRYPTO_SUITE = "SIGNATURE_CRYPTO_SUITE";
+    public  static final String VCTYPE = "vct";
+    public  static final String CONFIRMATION = "cnf";
+    public  static final String ISSUER = "iss";
+    public static final String TYPE = "type";
 }
@@ -9,4 +9,5 @@ public class VCDM2Constants {
     public static final String URL = "https://www.w3.org/ns/credentials/v2";
     public static final String VALID_UNITL = "validUntil";
     public static final String VALID_FROM = "validFrom";
+    public static final String CREDENTIAL_STATUS = "credentialStatus";
 }
@@ -5,13 +5,12 @@
  */
 package io.mosip.certify.core.constants;
 
-@Deprecated
 public class VCFormats {
 
     public static final String MSO_MDOC = "mso_mdoc";
     public static final String LDP_VC = "ldp_vc";
     public static final String SD_JWT = "dc+sd-jwt";
-    public static final String LDP_SD_JWT = "vc+sd-jwt";
+    public static final String VC_SD_JWT = "vc+sd-jwt";
     public static final String JWT_VC_JSON = "jwt_vc_json";
     public static final String JWT_VC_JSON_LD = "jwt_vc_json-ld";
 }
@@ -0,0 +1,13 @@
+package io.mosip.certify.core.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CertificateResponseDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String keyId;
+    private String certificateData;
+}
@@ -0,0 +1,23 @@
+package io.mosip.certify.core.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClaimsDisplayFieldsConfigDTO {
+    private List<Display> display;
+
+    @Data
+    @AllArgsConstructor
+    @NoArgsConstructor
+    public static class Display {
+        private String name;
+        private String locale;
+    }
+}
+
@@ -4,10 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.mosip.certify.core.constants.ErrorConstants;
 import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import org.hibernate.annotations.Comment;
 
 import java.util.List;
 import java.util.Map;
@@ -20,9 +18,9 @@ public class CredentialConfigurationDTO {
 
     private String credentialConfigKeyId;
 
-    private List<String> context;
+    private List<String> contextURLs;
 
-    private List<String> credentialType;
+    private List<String> credentialTypes;
 
     @NotNull(message = ErrorConstants.INVALID_REQUEST)
     private String credentialFormat;
@@ -35,34 +33,27 @@ public class CredentialConfigurationDTO {
 
     private String signatureAlgo; //Can be called as Proof algorithm
 
+    private String signatureCryptoSuite;
+
     private String sdClaim;
 
     @Valid
     @NotNull(message = ErrorConstants.INVALID_REQUEST)
-    private List<Map<String, Object>> display;
+    private List<MetaDataDisplayDTO> metaDataDisplay;
 
-    private List<String> order;
+    private List<String> displayOrder;
 
     @NotNull(message = ErrorConstants.INVALID_REQUEST)
     private String scope;
 
-    @NotNull(message = ErrorConstants.INVALID_REQUEST)
-    @JsonProperty("cryptographic_binding_methods_supported")
-    private List<String> cryptographicBindingMethodsSupported;
-
-    @NotNull
-    @JsonProperty("credential_signing_alg_values_supported")
-    private List<String> credentialSigningAlgValuesSupported;
+    @JsonProperty("credentialSubjectDefinition")
+    private Map<String, CredentialSubjectParametersDTO> credentialSubjectDefinition;
 
-    @NotNull(message = ErrorConstants.INVALID_REQUEST)
-    @JsonProperty("proof_types_supported")
-    private Map<String, Object> proofTypesSupported;
-
-    @JsonProperty("credentialSubject")
-    private Map<String, Object> credentialSubject;
+    @JsonProperty("msoMdocClaims")
+    private Map<String, Map<String, ClaimsDisplayFieldsConfigDTO>> msoMdocClaims;
 
-    @JsonProperty("claims")
-    private Map<String, Object> claims;
+    @JsonProperty("sdJwtClaims")
+    private Map<String, ClaimsDisplayFieldsConfigDTO> sdJwtClaims;
 
     @JsonProperty("doctype")
     private String docType;
@@ -71,4 +62,6 @@ public class CredentialConfigurationDTO {
     private String sdJwtVct;
 
     private List<Map<String, String>> pluginConfigurations;
+
+    private List<String> credentialStatusPurposes;
 }
@@ -37,7 +37,7 @@ public class CredentialConfigurationSupportedDTO {
 
     private Map<String, Object> claims;
 
-    private List<Map<String, Object>> display;
+    private List<MetaDataDisplayDTO> display;
 
     private List<String> order;
Original file line number	Diff line number	Diff line change
`@@ -9,4 +9,5 @@ public class VCDM2Constants {`
`9`	`9`	`public static final String URL = "https://www.w3.org/ns/credentials/v2";`
`10`	`10`	`public static final String VALID_UNITL = "validUntil";`
`11`	`11`	`public static final String VALID_FROM = "validFrom";`
	`12`	`+ public static final String CREDENTIAL_STATUS = "credentialStatus";`
`12`	`13`	`}`