Merge branch 'RED-7572' into 'master'

RED-7572 - Fix privateKey for digital signature

Closes RED-7572

See merge request redactmanager/persistence-service!113
This commit is contained in:
Andrei Isvoran 2023-09-11 13:04:56 +02:00
commit 701ee0ff43
2 changed files with 15 additions and 1 deletions

View File

@ -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();
}
}

View File

@ -20,5 +20,6 @@ public class DigitalSignature {
private String certificateName;
private String password;
private String base64EncodedPrivateKey;
private byte[] privateKey;
}