From 78bb3b72ca97dfbaf66937756a931a2a29117e36 Mon Sep 17 00:00:00 2001 From: Andrei Isvoran Date: Mon, 11 Sep 2023 13:49:24 +0300 Subject: [PATCH] RED-7572 - Fix privateKey for digital signature --- .../service/DigitalSignatureService.java | 15 ++++++++++++++- .../configuration/DigitalSignature.java | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java index 7fd16439e..846df6cfa 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java @@ -51,7 +51,7 @@ public class DigitalSignatureService { public DigitalSignatureEntity saveDigitalSignature(DigitalSignatureEntity digitalSignature) { try { - pdfTronRedactionClient.testDigitalCurrentSignature(MagicConverter.convert(digitalSignature, DigitalSignature.class)); + pdfTronRedactionClient.testDigitalCurrentSignature(convertDigitalSignature(digitalSignature)); } catch (Exception e) { throw new BadRequestException("Failed to test digital signature"); } @@ -79,4 +79,17 @@ public class DigitalSignatureService { digitalSignatureTypeService.setActiveDigitalSignatureType(DigitalSignatureType.CERTIFICATE); } + private DigitalSignature convertDigitalSignature(DigitalSignatureEntity digitalSignature) { + + return DigitalSignature.builder() + .id(digitalSignature.getId()) + .privateKey(digitalSignature.getPrivateKey()) + .reason(digitalSignature.getReason()) + .location(digitalSignature.getLocation()) + .password(digitalSignature.getPassword()) + .contactInfo(digitalSignature.getContactInfo()) + .certificateName(digitalSignature.getCertificateName()) + .build(); + } + } diff --git a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java index 22bf29125..ac9d503fa 100644 --- a/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java +++ b/persistence-service-v1/persistence-service-shared-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/shared/model/dossiertemplate/configuration/DigitalSignature.java @@ -20,5 +20,6 @@ public class DigitalSignature { private String certificateName; private String password; private String base64EncodedPrivateKey; + private byte[] privateKey; } -- 2.47.2