diff --git a/core/pom.xml b/core/pom.xml index 031e611ba7abc92b8006849bfd22225c279dd98d..05d16bac11e7e65e359aa8fcb3ad06f483c31db6 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -88,6 +88,12 @@ <artifactId>spring-boot-starter-oauth2-resource-server</artifactId> </dependency> + <dependency> + <groupId>cz.muni.fi.pa165</groupId> + <artifactId>user-client</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <!-- for pagination from JPA without actually using JPA --> <dependency> <groupId>org.springframework.data</groupId> diff --git a/core/src/main/java/cz/muni/fi/pa165/core/config/AppConfig.java b/core/src/main/java/cz/muni/fi/pa165/core/config/AppConfig.java index e408ac327c6fa08d5d7138672af0afa01ef3faaa..4ea03e651ade08f02eafe1e1e1a33a7f1c8e342c 100644 --- a/core/src/main/java/cz/muni/fi/pa165/core/config/AppConfig.java +++ b/core/src/main/java/cz/muni/fi/pa165/core/config/AppConfig.java @@ -1,13 +1,16 @@ package cz.muni.fi.pa165.core.config; +import cz.muni.fi.pa165.user.client.UserServiceInterceptionConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; import org.springframework.security.web.SecurityFilterChain; @Configuration +@Import(UserServiceInterceptionConfigurer.class) public class AppConfig { @Bean diff --git a/report/pom.xml b/report/pom.xml index 3f1cbc2f2b0467452ad0eb3abd24d20259148bba..8594269c13bf2e55d23d39706ca63f2b98e87122 100644 --- a/report/pom.xml +++ b/report/pom.xml @@ -73,6 +73,12 @@ <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId> </dependency> + <dependency> + <groupId>cz.muni.fi.pa165</groupId> + <artifactId>user-client</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> + <!-- for pagination from JPA without actually using JPA --> <dependency> <groupId>org.springframework.data</groupId> @@ -107,12 +113,18 @@ <artifactId>bcprov-jdk15on</artifactId> <version>1.56</version> </dependency> - + <dependency> <groupId>cz.muni.fi.pa165</groupId> <artifactId>core-client</artifactId> <version>1.0-SNAPSHOT</version> </dependency> + + <dependency> + <groupId>cz.muni.fi.pa165</groupId> + <artifactId>user-client</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> </dependencies> <build> diff --git a/report/src/main/java/cz/muni/fi/pa165/report/server/config/AppConfig.java b/report/src/main/java/cz/muni/fi/pa165/report/server/config/AppConfig.java index 10838730f0a50292fe97f192a1d7ad3909843a35..31261c2c45d87a76aece801bbfe5f79bba5f8b29 100644 --- a/report/src/main/java/cz/muni/fi/pa165/report/server/config/AppConfig.java +++ b/report/src/main/java/cz/muni/fi/pa165/report/server/config/AppConfig.java @@ -1,13 +1,16 @@ package cz.muni.fi.pa165.report.server.config; +import cz.muni.fi.pa165.user.client.UserServiceInterceptionConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.oauth2.server.resource.OAuth2ResourceServerConfigurer; import org.springframework.security.web.SecurityFilterChain; @Configuration +@Import(UserServiceInterceptionConfigurer.class) public class AppConfig { @Bean