From 5886093a0b612f31da03a59edd47981443793e36 Mon Sep 17 00:00:00 2001 From: dhanendra06 Date: Thu, 7 Nov 2024 12:30:53 +0530 Subject: [PATCH] MOSIP-32453 Signed-off-by: dhanendra06 --- pom.xml | 2 +- .../java/io/mosip/print/PrintPDFApplication.java | 5 +++++ .../mosip/print/service/impl/PrintServiceImpl.java | 12 +++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 716c2806..3eb188ac 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ io.mosip.vercred vcverifier - 1.1.0-SNAPSHOT + 1.0.0 diff --git a/src/main/java/io/mosip/print/PrintPDFApplication.java b/src/main/java/io/mosip/print/PrintPDFApplication.java index 3517949b..778ba87e 100644 --- a/src/main/java/io/mosip/print/PrintPDFApplication.java +++ b/src/main/java/io/mosip/print/PrintPDFApplication.java @@ -32,6 +32,11 @@ public CbeffUtil getCbeffUtil() { return new CbeffImpl(); } + @Bean + public CredentialsVerifier credentialsVerifier() { + return new CredentialsVerifier(); + } + @Bean public ThreadPoolTaskScheduler taskScheduler() { ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler(); diff --git a/src/main/java/io/mosip/print/service/impl/PrintServiceImpl.java b/src/main/java/io/mosip/print/service/impl/PrintServiceImpl.java index b480f03d..2e3b1f13 100644 --- a/src/main/java/io/mosip/print/service/impl/PrintServiceImpl.java +++ b/src/main/java/io/mosip/print/service/impl/PrintServiceImpl.java @@ -34,7 +34,7 @@ import io.mosip.vercred.CredentialsVerifier; import io.mosip.vercred.exception.ProofDocumentNotFoundException; -import io.mosip.vercred.exception.ProofTypeNotSupportedException; +import io.mosip.vercred.exception.ProofTypeNotFoundException; import io.mosip.vercred.exception.PubicKeyNotFoundException; import io.mosip.vercred.exception.UnknownException; import org.apache.commons.codec.binary.Base64; @@ -175,7 +175,8 @@ public class PrintServiceImpl implements PrintService { @Autowired private Environment env; - private CredentialsVerifier credentialsVerifier= new CredentialsVerifier(); + @Autowired + private CredentialsVerifier credentialsVerifier; @Value("${mosip.datashare.partner.id}") private String partnerId; @@ -238,13 +239,13 @@ private boolean hasPrintCredentialVerified(EventModel eventModel, String decoded if (verifyCredentialsFlag) { printLogger.info("Configured received credentials to be verified. Flag {}", verifyCredentialsFlag); try { - boolean verified = credentialsVerifier.verifyCredentials(decodedCredential); + boolean verified = credentialsVerifier.verifyPrintCredentials(decodedCredential); if (!verified) { printLogger.error("Received Credentials failed in verifiable credential verify method. So, the credentials will not be printed." + " Id: {}, Transaction Id: {}", eventModel.getEvent().getId(), eventModel.getEvent().getTransactionId()); return false; } - } catch (ProofDocumentNotFoundException | ProofTypeNotSupportedException e) { + } catch (ProofDocumentNotFoundException | ProofTypeNotFoundException e) { printLogger.error("Proof document is not available in the received credentials." + " Id: {}, Transaction Id: {}", eventModel.getEvent().getId(), eventModel.getEvent().getTransactionId()); return false; @@ -391,7 +392,8 @@ private Map getDocuments(String credential, String credentialTyp description.setMessage(PlatformErrorMessages.PRT_PRT_PDF_GENERATION_FAILED.getMessage()); description.setCode(PlatformErrorMessages.PRT_PRT_PDF_GENERATION_FAILED.getCode()); printLogger.error(ex.getMessage() ,ex); - + throw new PDFGeneratorException(PDFGeneratorExceptionCodeConstant.PDF_EXCEPTION.getErrorCode(), + ex.getMessage() ,ex); } finally { String eventId = ""; String eventName = "";