Merge pull request #190 from vharsh/release_merge

[INJICERT-657] merge release-0.10.x to develop

api-test/pom.xml

@@ -2,13 +2,13 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>io.mosip.injicertify</groupId>
+	<groupId>io.mosip.certify</groupId>
 	<artifactId>apitest-injicertify</artifactId>
 	<packaging>jar</packaging>
 	<name>apitest-injicertify</name>
 	<description>Parent project of apitest-injicertify</description>
 	<url>https://github.com/mosip/inji-certify</url>
-	<version>0.9.0-SNAPSHOT</version>
+	<version>0.10.0-SNAPSHOT</version>
 
 	<licenses>
 		<license>
@@ -51,7 +51,7 @@
 		<maven.source.plugin.version>2.2.1</maven.source.plugin.version>
 
 		<git.commit.id.plugin.version>3.0.1</git.commit.id.plugin.version>
-		<fileName>apitest-injicertify-0.9.0-SNAPSHOT-jar-with-dependencies</fileName>
+		<fileName>apitest-injicertify-0.10.0-SNAPSHOT-jar-with-dependencies</fileName>
 	</properties>
 
 	<dependencies>

api-test/src/main/java/io/mosip/testrig/apirig/injicertify/testrunner/MosipTestRunner.java

@@ -10,7 +10,6 @@
 import java.security.PublicKey;
 import java.security.interfaces.RSAPublicKey;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -27,7 +26,6 @@
 import io.mosip.testrig.apirig.dbaccess.DBManager;
 import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyConfigManager;
 import io.mosip.testrig.apirig.injicertify.utils.InjiCertifyUtil;
-import io.mosip.testrig.apirig.report.EmailableReport;
 import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.testrunner.ExtractResource;
 import io.mosip.testrig.apirig.testrunner.HealthChecker;

api-test/src/main/java/io/mosip/testrig/apirig/injicertify/utils/InjiCertifyUtil.java

@@ -637,15 +637,6 @@ public static String getKeyWordFromEndPoint(String endPoint) {
 		return "";
 	}
 
-//	public static String inputstringKeyWordHandeler(String jsonString, String testCaseName) {
-//		if (jsonString.contains(GlobalConstants.TIMESTAMP))
-//			jsonString = replaceKeywordValue(jsonString, GlobalConstants.TIMESTAMP, generateCurrentUTCTimeStamp());
-//		
-//		
-//		return jsonString;
-//		
-//	}
-
 	public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
 		String testCaseName = testCaseDTO.getTestCaseName();
 
@@ -751,4 +742,4 @@ else if (testCaseName.contains("_Invalid_Exp_"))
 		return proofJWT;
 	}
 
-}
+}

api-test/src/main/resources/config/injiCertify.properties

@@ -13,7 +13,7 @@ signupSettingsEndPoint=/v1/signup/settings
 actuatorMimotoEndpoint=/residentmobileapp/actuator/env
 esignetActuatorPropertySection=esignet-default.properties
 injiCertifyWellKnownEndPoint=/v1/certify/issuance/.well-known/openid-credential-issuer
-sunBirdBaseURL=https://registry.dev1.mosip.net
+sunBirdBaseURL=https://registry.released.mosip.net
 # allowed useCaseToExecute values are sunbird,mosipid,mock.
 useCaseToExecute=sunbird,mosipid,mock
 #moduleNamePattern=(mimoto|certify|signup|partnermanager|preregistration|resident|residentmobileapp|masterdata|esignet|idgenerator|policymanager|idauthentication|idrepository|auditmanager|authmanager|keymanager|mock-identity-system)

api-test/src/main/resources/injicertify/AddIdentityMock/AddIdentity.hbs

@@ -5,6 +5,7 @@
 		"pin": "{{pin}}",
 		"email": "{{email}}",
 		"phone": "{{phone}}",
+		"password": "{{password}}",
 		"fullName": [
 			{
 				"language": "fra",

certify-core/pom.xml

@@ -53,48 +53,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-cache</artifactId>
         </dependency>
-        <!-- templating dependencies -->
-        <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.7</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.velocity.tools</groupId>
-            <artifactId>velocity-tools-generic</artifactId>
-            <version>3.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.velocity</groupId>
-                    <artifactId>velocity-engine-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>jakarta.persistence</groupId>
-            <artifactId>jakarta.persistence-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-jpa</artifactId>
-        </dependency>
     </dependencies>
-</project>
+</project>

certify-core/src/main/java/io/mosip/certify/core/constants/Constants.java

@@ -9,10 +9,20 @@ public class Constants {
 
     public static final String UTC_DATETIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
     public static final String SPACE = " ";
+    public static final String APPLICATION_ID = "applicationId";
+    public static final String REFERENCE_ID = "referenceId";
 
     public static final String C_NONCE = "c_nonce";
     public static final String C_NONCE_EXPIRES_IN = "c_nonce_expires_in";
     public static final String CLIENT_ID = "client_id";
     public static final String CERTIFY_PARTNER_APP_ID = "CERTIFY_PARTNER";
     public static final String CERTIFY_SERVICE_APP_ID = "CERTIFY_SERVICE";
+    public static final String CERTIFY_VC_SIGN_RSA = "CERTIFY_VC_SIGN_RSA";
+    public static final String CERTIFY_VC_SIGN_ED25519 = "CERTIFY_VC_SIGN_ED25519";
+    public static final String ROOT_KEY = "ROOT";
+    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 RENDERING_TEMPLATE_ID = "renderingTemplateId";
 }

certify-core/src/main/java/io/mosip/certify/core/constants/ErrorConstants.java

@@ -22,7 +22,12 @@ public class ErrorConstants {
     public static final String PROOF_HEADER_INVALID_ALG = "proof_header_invalid_alg";
     public static final String PROOF_HEADER_INVALID_KEY = "proof_header_invalid_key";
     public static final String PROOF_HEADER_AMBIGUOUS_KEY = "proof_header_ambiguous_key";
-    public static final String UNSUPPORTED_OPENID_VERSION = "unsupported_openid4vci_draft_version";
+    public static final String UNSUPPORTED_OPENID_VERSION = "unsupported_openid4vci_version";
     public static final String INVALID_TEMPLATE_ID = "template_with_id_not_found";
     public static final String EMPTY_TEMPLATE_CONTENT = "empty_template_content";
+    public static final String EXPECTED_TEMPLATE_NOT_FOUND = "expected_template_not_found";
+    public static final String UNSUPPORTED_IN_CURRENT_PLUGIN_MODE = "unsupported_in_current_plugin_mode";
+    public static final String UNSUPPORTED_ALGORITHM = "unsupported_algorithm";
+    public static final String INVALID_CERTIFICATE = "invalid_certificate";
+    public static final String VERIFICATION_METHOD_GENERATION_FAILED = "verification_method_generation_failed";
 }

certify-core/src/main/java/io/mosip/certify/core/constants/SignatureAlg.java

@@ -7,9 +7,9 @@
  */
 public class SignatureAlg {
     // LinkedDataSignature Algorithms
-    public static final String RSA_SIGNATURE_SUITE = "RsaSignature2018";
+    public static final String RSA_SIGNATURE_SUITE_2018 = "RsaSignature2018";
 
-    public static final String ED25519_SIGNATURE_SUITE = "Ed25519Signature2018";
+    public static final String ED25519_SIGNATURE_SUITE_2018 = "Ed25519Signature2018";
 
     public static final String ED25519_SIGNATURE_SUITE_2020 = "Ed25519Signature2020";
 

certify-core/src/main/java/io/mosip/certify/core/exception/RenderingTemplateException.java

@@ -0,0 +1,14 @@
+package io.mosip.certify.core.exception;
+
+public class RenderingTemplateException extends RuntimeException {
+    private String errorCode;
+
+    public RenderingTemplateException(String errorCode) {
+        super(errorCode);
+        this.errorCode = errorCode;
+    }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+}

certify-core/src/main/java/io/mosip/certify/core/spi/SvgTemplateService.java → certify-core/src/main/java/io/mosip/certify/core/spi/RenderingTemplateService.java

@@ -5,10 +5,8 @@
  */
 package io.mosip.certify.core.spi;
 
-import io.mosip.certify.core.entity.SvgTemplate;
+import io.mosip.certify.api.dto.RenderingTemplateDTO;
 
-import java.util.UUID;
-
-public interface SvgTemplateService {
-    SvgTemplate getSvgTemplate(UUID id);
+public interface RenderingTemplateService {
+    RenderingTemplateDTO getSvgTemplate(String id);
 }

certify-core/src/main/java/io/mosip/certify/core/spi/VCIssuanceService.java

@@ -20,4 +20,6 @@ public interface VCIssuanceService {
     <T> CredentialResponse<T> getCredential(CredentialRequest credentialRequest);
 
     Map<String, Object> getCredentialIssuerMetadata(String version);
+
+    Map<String, Object> getDIDDocument();
 }

certify-integration-api/src/main/java/io/mosip/certify/api/dto/RenderingTemplateDTO.java

@@ -0,0 +1,13 @@
+package io.mosip.certify.api.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class RenderingTemplateDTO {
+    private String id;
+    private String template;
+    private LocalDateTime createdTimes;
+    private LocalDateTime updatedTimes;
+}

certify-integration-api/src/main/java/io/mosip/certify/api/spi/DataProviderPlugin.java

@@ -6,9 +6,10 @@
 import java.util.Map;
 
 /**
- * DataProviderPlugin is implemented by type#2 of identity plugin
- *  implementors to fetch data for Certify to template into a VC
- *  format of choice using {@link VCFormatter}.
+ * DataProviderPlugin is implemented by VC plugin
+ *  implementors who want to make use of the Certify to generate the VC.
+ *  Data is fetched from a Plugin implementation, templated using {@link VCFormatter}
+ *  and then signed using {@link VCSigner}.
  */
 public interface DataProviderPlugin {
     JSONObject fetchData(Map<String, Object> identityDetails) throws DataProviderExchangeException;

certify-integration-api/src/main/java/io/mosip/certify/api/spi/VCIssuancePlugin.java

@@ -11,7 +11,13 @@
 import io.mosip.certify.api.exception.VCIExchangeException;
 
 import java.util.Map;
-
+/**
+ * VCIssuancePlugin is implemented by VC plugin
+ *  implementors who want to make use of an existing VC Issuance Infrastructure
+ *  or want to do everything by themselves to generate the VC from the plugin.
+ *  VC is received by the plugin and sent to Certify and forwarded to the
+ *  client applications.
+ */
 public interface VCIssuancePlugin {
 
     /**