From d0d26637d3d9541f26861457dc9cdb4f80f4e6d5 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Mon, 4 Nov 2024 09:46:30 +0100 Subject: [PATCH 1/3] add doc --- .../esupportail/esupsignature/config/GlobalProperties.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java b/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java index 100f4eb8a..531d70afb 100644 --- a/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java +++ b/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java @@ -290,7 +290,7 @@ public enum TokenType { private SignRequestParams externalSignatureParams = new SignRequestParams(); /** - * Activation de l'intro d'aide + * Activation de l’intro d’aide */ private Boolean enableHelp = true; @@ -299,6 +299,9 @@ public enum TokenType { */ private String testEmail; + /** + * Activer la vérification des numéros de téléphone français pour l’OTP + */ Boolean frenchPhoneNumberOnly = false; public String getRootUrl() { From e90fc3aa7eb2fcc19859c677954ec3f0cc696712 Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Mon, 4 Nov 2024 12:00:05 +0100 Subject: [PATCH 2/3] fix bad test for seal certificat --- pom.xml | 2 +- .../esupsignature/service/CertificatService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d9291c710..2406464fe 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.esupportail esup-signature - 1.31.0-SNAPSHOT + 1.31.1-SNAPSHOT esup-signature org.esupportail.esupsignature.EsupSignatureApplication diff --git a/src/main/java/org/esupportail/esupsignature/service/CertificatService.java b/src/main/java/org/esupportail/esupsignature/service/CertificatService.java index 7c36fe351..0d09639b9 100644 --- a/src/main/java/org/esupportail/esupsignature/service/CertificatService.java +++ b/src/main/java/org/esupportail/esupsignature/service/CertificatService.java @@ -171,8 +171,8 @@ public SignatureTokenConnection getSealToken() { } public AbstractKeyStoreTokenConnection getPkcsToken() throws EsupSignatureKeystoreException { - if(!StringUtils.hasText(globalProperties.getSealCertificatPin())) { - if (!StringUtils.hasText(globalProperties.getSealCertificatDriver()) && globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS11)) { + if(StringUtils.hasText(globalProperties.getSealCertificatPin())) { + if (StringUtils.hasText(globalProperties.getSealCertificatDriver()) && globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS11)) { KeyStore.PasswordProtection passwordProtection = new KeyStore.PasswordProtection(globalProperties.getSealCertificatPin().toCharArray()); return new eu.europa.esig.dss.token.Pkcs11SignatureToken(globalProperties.getSealCertificatDriver(), passwordProtection); } else if (!StringUtils.hasText(globalProperties.getSealCertificatFile()) && globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS12)) { @@ -199,7 +199,7 @@ public List getSealCertificats() { if(privateKeysCache.getIfPresent("keys") != null) return privateKeysCache.getIfPresent("keys"); List dssPrivateKeyEntries = new ArrayList<>(); try { - if ((!StringUtils.hasText(globalProperties.getSealCertificatDriver()) && globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS11)) || globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS12)) { + if ((StringUtils.hasText(globalProperties.getSealCertificatDriver()) && globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS11)) || globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.PKCS12)) { dssPrivateKeyEntries = getPkcsToken().getKeys(); } else if (globalProperties.getSealCertificatType().equals(GlobalProperties.TokenType.OPENSC)) { dssPrivateKeyEntries = openSCSignatureToken.getKeys(); From f96c12f9d2c7db7ea3c22dbfaa4034d479d2962c Mon Sep 17 00:00:00 2001 From: David Lemaignent Date: Mon, 4 Nov 2024 12:04:56 +0100 Subject: [PATCH 3/3] fix wizard link on share --- src/main/resources/templates/fragments/new.html | 2 +- src/main/resources/templates/fragments/sides/side-home.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/fragments/new.html b/src/main/resources/templates/fragments/new.html index 41a41a9b8..2e49b275c 100644 --- a/src/main/resources/templates/fragments/new.html +++ b/src/main/resources/templates/fragments/new.html @@ -44,7 +44,7 @@
Outils de signature
Circuits
-
diff --git a/src/main/resources/templates/fragments/sides/side-home.html b/src/main/resources/templates/fragments/sides/side-home.html index 9bd224732..c34dfefc1 100644 --- a/src/main/resources/templates/fragments/sides/side-home.html +++ b/src/main/resources/templates/fragments/sides/side-home.html @@ -1,10 +1,10 @@ -