From 23fb2d6c47bf756880dcd86518f5fe269e4b5d03 Mon Sep 17 00:00:00 2001
From: Harsh <thevharsh@gmail.com>
Date: Thu, 19 Dec 2024 11:37:35 +0530
Subject: [PATCH] [INJICERT-657] update SQL template scripts & fix VC key bug

Signed-off-by: Harsh <thevharsh@gmail.com>
---
 .../Ed25519Signature2018ProofGenerator.java   |  2 -
 .../Ed25519Signature2020ProofGenerator.java   |  2 -
 .../VelocityTemplatingEngineImpl.java         |  2 +-
 .../docker-compose-injistack/certify_init.sql | 61 +++++++++----------
 4 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2018ProofGenerator.java b/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2018ProofGenerator.java
index 9f8c43e3..a191490f 100644
--- a/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2018ProofGenerator.java
+++ b/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2018ProofGenerator.java
@@ -42,8 +42,6 @@ public LdProof generateProof(LdProof vcLdProof, String vcEncodedHash, Map<String
         payload.setDataToSign(vcEncodedHash);
         payload.setApplicationId(keyID.get(Constants.APPLICATION_ID));
         payload.setReferenceId(keyID.get(Constants.REFERENCE_ID));
-        payload.setApplicationId(Constants.CERTIFY_VC_SIGN_ED25519);
-        payload.setReferenceId(Constants.ED25519_REF_ID); // alg, empty = RSA
         payload.setIncludePayload(false);
         payload.setIncludeCertificate(false);
         payload.setIncludeCertHash(true);
diff --git a/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java b/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java
index 33f3c6cb..f2081921 100644
--- a/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java
+++ b/certify-service/src/main/java/io/mosip/certify/proofgenerators/Ed25519Signature2020ProofGenerator.java
@@ -44,8 +44,6 @@ public LdProof generateProof(LdProof vcLdProof, String vcEncodedHash, Map<String
         SignRequestDtoV2 srd = new SignRequestDtoV2();
         srd.setApplicationId(keyID.get(Constants.APPLICATION_ID));
         srd.setReferenceId(keyID.get(Constants.REFERENCE_ID));
-        srd.setApplicationId(Constants.CERTIFY_VC_SIGN_ED25519);
-        srd.setReferenceId(Constants.ED25519_REF_ID);
         srd.setDataToSign(vcEncodedHash);
         srd.setResponseEncodingFormat("base58btc");
         srd.setSignAlgorithm(JWSAlgorithm.EdDSA);
diff --git a/certify-service/src/main/java/io/mosip/certify/vcformatters/VelocityTemplatingEngineImpl.java b/certify-service/src/main/java/io/mosip/certify/vcformatters/VelocityTemplatingEngineImpl.java
index a235c6f0..164b9ae1 100644
--- a/certify-service/src/main/java/io/mosip/certify/vcformatters/VelocityTemplatingEngineImpl.java
+++ b/certify-service/src/main/java/io/mosip/certify/vcformatters/VelocityTemplatingEngineImpl.java
@@ -53,7 +53,7 @@ public class VelocityTemplatingEngineImpl implements VCFormatter {
     @Value("${mosip.certify.data-provider-plugin.vc-expiry-duration:P730d}")
     String defaultExpiryDuration;
 
-    @Value("${mosip.certify.issuer.id.field.prefix.url:}")
+    @Value("${mosip.certify.data-provider-plugin.id-field-prefix-uri:}")
     String idPrefix;
 
     @PostConstruct
diff --git a/docker-compose/docker-compose-injistack/certify_init.sql b/docker-compose/docker-compose-injistack/certify_init.sql
index 59230463..ce569e17 100644
--- a/docker-compose/docker-compose-injistack/certify_init.sql
+++ b/docker-compose/docker-compose-injistack/certify_init.sql
@@ -113,37 +113,36 @@ INSERT INTO certify.credential_template (context, credential_type, template, cr_
 }
 ', '2024-10-24 12:32:38.065994', NULL);
 
-INSERT INTO certify.template_data (context, credential_type, template, cr_dtimes, upd_dtimes) VALUES ('https://www.w3.org/ns/credentials/v2', 'FarmerCredential,VerifiableCredential', '{
-     "@context": [
-                "https://www.w3.org/ns/credentials/v2",
-                "https://vharsh.github.io/DID/farmer.json",
-                "https://w3id.org/security/suites/ed25519-2020/v1"
-        ],
-        "issuer": "${_issuer}",
-        "type": [
-            "VerifiableCredential",
-            "FarmerCredential"
-        ],
-        "validFrom": "${validFrom}",
-        "validUntil": "${validUntil}",
-        "credentialSubject": {
-            "name": "${name}",
-            "dateOfBirth": "${dateOfBirth}",
-            "highestEducation": "${highestEducation}",
-            "maritalStatus": "${maritalStatus}",
-            "typeOfHouse": "${typeOfHouse}",
-            "numberOfDependents": "${numberOfDependents}",
-            "phoneNumber": "${phoneNumber}",
-            "works": "${works}",
-            "landArea": "${landArea}",
-            "landOwnershipType": "${landOwnershipType}",
-            "primaryCropType": "${primaryCropType}",
-            "secondaryCropType": "${secondaryCropType}",
-            "face": "${face}",
-            "farmerID": "${farmerID}"
-        }
-}
-', '2024-10-24 12:32:38.065994', NULL);
+INSERT INTO certify.credential_template (context, credential_type, template, cr_dtimes, upd_dtimes) VALUES ('https://www.w3.org/ns/credentials/v2', 'FarmerCredential,VerifiableCredential', '{
+    "@context": [
+        "https://www.w3.org/ns/credentials/v2",
+        "https://piyush7034.github.io/my-files/farmer.json",
+        "https://w3id.org/security/suites/ed25519-2020/v1"
+    ],
+    "issuer": "${_issuer}",
+    "type": [
+        "VerifiableCredential",
+        "FarmerCredential"
+    ],
+    "validFrom": "${validFrom}",
+    "validUntil": "${validUntil}",
+    "credentialSubject": {
+        "fullName": "${fullName}",
+        "mobileNumber": "${mobileNumber}",
+        "dateOfBirth": "${dateOfBirth}",
+        "gender": "${gender}",
+        "state": "${state}",
+        "district": "${district}",
+        "villageOrTown": "${villageOrTown}",
+        "postalCode": "${postalCode}",
+        "landArea": "${landArea}",
+        "landOwnershipType": "${landOwnershipType}",
+        "primaryCropType": "${primaryCropType}",
+        "secondaryCropType": "${secondaryCropType}",
+        "face": "${face}",
+        "farmerID": "${farmerID}"
+    }
+}', '2024-10-24 12:32:38.065994', NULL);
 
 INSERT INTO certify.key_policy_def(APP_ID,KEY_VALIDITY_DURATION,PRE_EXPIRE_DAYS,ACCESS_ALLOWED,IS_ACTIVE,CR_BY,CR_DTIMES) VALUES('ROOT', 2920, 1125, 'NA', true, 'mosipadmin', now());
 INSERT INTO certify.key_policy_def(APP_ID,KEY_VALIDITY_DURATION,PRE_EXPIRE_DAYS,ACCESS_ALLOWED,IS_ACTIVE,CR_BY,CR_DTIMES) VALUES('CERTIFY_SERVICE', 1095, 60, 'NA', true, 'mosipadmin', now());