From 38941d8d8a2afceaf3ac7f8e84ed6f4ffbf1431c Mon Sep 17 00:00:00 2001 From: Piyush7034 Date: Fri, 18 Jul 2025 19:15:56 +0530 Subject: [PATCH 1/2] [INJICERT-1145] Fix mdoc failure issue (#118) Signed-off-by: Piyush7034 --- .../io/mosip/certify/mock/integration/mocks/MdocGenerator.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mock-certify-plugin/src/main/java/io/mosip/certify/mock/integration/mocks/MdocGenerator.java b/mock-certify-plugin/src/main/java/io/mosip/certify/mock/integration/mocks/MdocGenerator.java index 3e285931..565344cb 100644 --- a/mock-certify-plugin/src/main/java/io/mosip/certify/mock/integration/mocks/MdocGenerator.java +++ b/mock-certify-plugin/src/main/java/io/mosip/certify/mock/integration/mocks/MdocGenerator.java @@ -10,6 +10,7 @@ import com.android.identity.mdoc.util.MdocUtil; import com.android.identity.util.Timestamp; import io.mosip.certify.util.*; +import org.springframework.stereotype.Component; import java.io.ByteArrayOutputStream; import java.security.KeyPair; @@ -20,6 +21,7 @@ import java.time.temporal.ChronoUnit; import java.util.*; +@Component public class MdocGenerator { public static final String NAMESPACE = "org.iso.18013.5.1"; From 02843089d67fa5e34fb58fd293293d97662b6c48 Mon Sep 17 00:00:00 2001 From: Piyush7034 Date: Thu, 24 Jul 2025 17:58:21 +0530 Subject: [PATCH 2/2] [INJICERT-1145] Remove VerifiableCredentia as first type condition Signed-off-by: Piyush7034 --- .../integration/service/SunbirdRCVCIssuancePlugin.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sunbird-rc-certify-integration-impl/src/main/java/io/mosip/certify/sunbirdrc/integration/service/SunbirdRCVCIssuancePlugin.java b/sunbird-rc-certify-integration-impl/src/main/java/io/mosip/certify/sunbirdrc/integration/service/SunbirdRCVCIssuancePlugin.java index 68b51df5..dda880e9 100644 --- a/sunbird-rc-certify-integration-impl/src/main/java/io/mosip/certify/sunbirdrc/integration/service/SunbirdRCVCIssuancePlugin.java +++ b/sunbird-rc-certify-integration-impl/src/main/java/io/mosip/certify/sunbirdrc/integration/service/SunbirdRCVCIssuancePlugin.java @@ -131,11 +131,11 @@ public VCResult getVerifiableCredentialWithLinkedDataProof(VCReque throw new VCIExchangeException(ErrorConstants.VCI_EXCHANGE_FAILED); } List types = vcRequestDto.getType(); - if (types.isEmpty() || !types.get(0).equals("VerifiableCredential")) { - log.error("Invalid request: first item in type is not VerifiableCredential"); + if (types.isEmpty() || !types.contains("VerifiableCredential")) { + log.error("Invalid request: VerifiableCredential not present in types"); throw new VCIExchangeException(ErrorConstants.VCI_EXCHANGE_FAILED); } - types.remove(0); + types.remove("VerifiableCredential"); String requestedCredentialType = String.join("-", types); //Check if the key is in the supported-credential-types if (!supportedCredentialTypes.contains(requestedCredentialType)) {