Merge pull request #64 from EsupPortail/testing

v1.13

pom.xml

@@ -12,7 +12,7 @@
 	</parent>
 	<groupId>org.esupportail</groupId>
 	<artifactId>esup-signature</artifactId>
-	<version>1.12.3</version>
+	<version>1.13</version>
 	<name>esup-signature</name>
 	<properties>
 		<start-class>org.esupportail.esupsignature.EsupSignatureApplication</start-class>
@@ -179,6 +179,16 @@
 
 		<!-- Webjars dependencies -->
 
+		<dependency>
+			<groupId>org.webjars.bower</groupId>
+			<artifactId>google-code-prettify</artifactId>
+			<version>1.0.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.webjars</groupId>
+			<artifactId>popper.js</artifactId>
+			<version>2.5.4</version>
+		</dependency>
 		<dependency>
 			<groupId>org.webjars</groupId>
 			<artifactId>jquery</artifactId>
@@ -639,9 +649,9 @@
 			<version>2.4.0</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.AgNO3</groupId>
+			<groupId>eu.agno3.jcifs</groupId>
 			<artifactId>jcifs-ng</artifactId>
-			<version>3db3e62157</version>
+			<version>2.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.chemistry.opencmis</groupId>

src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java

@@ -32,6 +32,7 @@ public class GlobalProperties implements Cloneable {
     private String applicationEmail = "[email protected]";
     private int hoursBeforeRefreshNotif = 24;
     private Boolean infiniteScrolling = true;
+    private Boolean returnToHomeAfterSign = true;
     /**
      * Choisir le fonctionnement des délégations :
      *  <ul>
@@ -202,4 +203,12 @@ public Boolean getInfiniteScrolling() {
     public void setInfiniteScrolling(Boolean infiniteScrolling) {
         this.infiniteScrolling = infiniteScrolling;
     }
+
+    public Boolean getReturnToHomeAfterSign() {
+        return returnToHomeAfterSign;
+    }
+
+    public void setReturnToHomeAfterSign(Boolean returnToHomeAfterSign) {
+        this.returnToHomeAfterSign = returnToHomeAfterSign;
+    }
 }

src/main/java/org/esupportail/esupsignature/config/WebAppConfig.java

@@ -91,6 +91,7 @@ public FilterRegistrationBean registerOpenEntityManagerInViewFilterBean() {
 		registrationBean.addUrlPatterns(
 				"/user/", "/user/*",
 				"/admin/", "/admin/*",
+				"/manager/", "/manager/*",
 				"/public/", "/public/*",
 				"/ws/", "/ws/*"
 		);

src/main/java/org/esupportail/esupsignature/config/pdf/PdfConfig.java

@@ -2,9 +2,9 @@
 
 import org.esupportail.esupsignature.exception.EsupSignatureRuntimeException;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import javax.annotation.PostConstruct;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
@@ -25,7 +25,7 @@ public PdfProperties getPdfProperties() {
         return pdfProperties;
     }
 
-    @Bean
+    @PostConstruct
     public void setPdfColorProfileUrl() {
         try {
             Path iccPath = Path.of(PdfConfig.class.getResource("/srgb.icc").getPath());

src/main/java/org/esupportail/esupsignature/config/security/WebSecurityConfig.java

@@ -109,7 +109,6 @@ private void setAuthorizeRequests(HttpSecurity http) throws Exception {
 				.antMatchers("/").permitAll()
 				.antMatchers("/admin/", "/admin/**").access("hasRole('ROLE_ADMIN')")
 				.antMatchers("/user/", "/user/**").access("hasAnyRole('ROLE_USER', 'ROLE_OTP')")
-				.antMatchers("/sse/", "/sse/**").access("hasAnyRole('ROLE_USER', 'ROLE_OTP')")
 				.antMatchers("/public/", "/public/**").permitAll()
 				.antMatchers("/h2-console/**").access("hasRole('ROLE_ADMIN')")
 				.antMatchers("/webjars/**").permitAll();

src/main/java/org/esupportail/esupsignature/config/sign/SignProperties.java

@@ -16,6 +16,7 @@ public class SignProperties {
     private ASiCContainerType containerType;
     private SignaturePackaging signaturePackaging;
     private Long passwordTimeout;
+    private String aesKey;
 
     public SignatureForm getDefaultSignatureForm() {
         return defaultSignatureForm;
@@ -95,4 +96,12 @@ public Long getPasswordTimeout() {
     public void setPasswordTimeout(Long passwordTimeout) {
         this.passwordTimeout = passwordTimeout;
     }
+
+    public String getAesKey() {
+        return aesKey;
+    }
+
+    public void setAesKey(String aesKey) {
+        this.aesKey = aesKey;
+    }
 }