diff --git a/build.gradle b/build.gradle index 4d6e16576bcad3c185807d8ee50d13fe723d0d78..61471edcd19d6be1f53db02f673c1870f20a121a 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'idea' id 'java' id 'jacoco' - id 'org.springframework.boot' version '3.3.5' + id 'org.springframework.boot' version '3.4.4' id 'io.spring.dependency-management' version '1.1.7' id 'org.springdoc.openapi-gradle-plugin' version '1.9.0' } @@ -128,7 +128,7 @@ dependencies { testImplementation group: 'org.springframework.security', name: 'spring-security-test', version: spring_security_version implementation group: 'io.micrometer', name: 'micrometer-registry-prometheus', version: '1.14.5' - implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.3.0' + implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.7.0' } diff --git a/src/main/java/coop/libriciel/ipcore/configuration/SpringSecurityConfig.java b/src/main/java/coop/libriciel/ipcore/configuration/SpringSecurityConfig.java index 562288fcda6ca925e260af3fb170213b86243979..4b750ac1edbdc56c271bd30e240a1e2822d45f7e 100644 --- a/src/main/java/coop/libriciel/ipcore/configuration/SpringSecurityConfig.java +++ b/src/main/java/coop/libriciel/ipcore/configuration/SpringSecurityConfig.java @@ -30,7 +30,6 @@ import org.springframework.security.config.annotation.method.configuration.Enabl import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; -import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer; import org.springframework.security.oauth2.jwt.JwtDecoder; import org.springframework.security.oauth2.jwt.JwtValidators; import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; @@ -61,18 +60,6 @@ public class SpringSecurityConfig { this.keycloakProperties = keycloakProperties; } - - @Bean - @Order(50) - public SecurityFilterChain pesViewerFilterChain(HttpSecurity http) throws Exception { - http.securityMatcher("/v1/tenant/*/folder/*/document/*/pes-viewer") - .headers(headersConfigurer -> - headersConfigurer.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin) - ); - return http.build(); - } - - @Bean @Order(5) public SecurityFilterChain mainSecurityFilterChain(HttpSecurity http) throws Exception { diff --git a/src/test/java/coop/libriciel/ipcore/business/typology/TypologyBusinessServiceTest.java b/src/test/java/coop/libriciel/ipcore/business/typology/TypologyBusinessServiceTest.java index 2dfb3fcde6f2fb6e6a98d804d2ddd502f49bb82c..f50b24d0490bf37d6852fc9e3fbc1524a28337e1 100644 --- a/src/test/java/coop/libriciel/ipcore/business/typology/TypologyBusinessServiceTest.java +++ b/src/test/java/coop/libriciel/ipcore/business/typology/TypologyBusinessServiceTest.java @@ -40,7 +40,8 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; import static java.util.Collections.singletonList; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; @SpringBootTest @@ -74,8 +75,8 @@ class TypologyBusinessServiceTest { @AfterEach void cleanup() { - typeRepository.deleteAll(); subtypeRepository.deleteAll(); + typeRepository.deleteAll(); tenantRepository.deleteAll(); } diff --git a/src/test/resources/ip-core-openapi-provisioning.json b/src/test/resources/ip-core-openapi-provisioning.json index eaf0d0d3bb9bf704a13969d6200caad8fbe3d928..f349eb4161f0b73a7acba56199501ad536354687 100644 --- a/src/test/resources/ip-core-openapi-provisioning.json +++ b/src/test/resources/ip-core-openapi-provisioning.json @@ -1892,6 +1892,7 @@ "tokenUrl": "./auth/realms/api/protocol/openid-connect/token" } }, + "name": "OAuth2 flow", "type": "oauth2" } } diff --git a/src/test/resources/ip-core-openapi-standard.json b/src/test/resources/ip-core-openapi-standard.json index 4325c9458b25343693eed1110336482c8001564d..2af759670db0ff0648853f27d7b96db21a3b07a9 100644 --- a/src/test/resources/ip-core-openapi-standard.json +++ b/src/test/resources/ip-core-openapi-standard.json @@ -716,6 +716,7 @@ "tokenUrl": "./auth/realms/api/protocol/openid-connect/token" } }, + "name": "OAuth2 flow", "type": "oauth2" } }