From a94cdd580240b159106752ee124d730bd5d41806 Mon Sep 17 00:00:00 2001
From: Matej Hrica <492778@mail.muni.cz>
Date: Sun, 7 May 2023 21:41:23 +0200
Subject: [PATCH] Add user-client dependancy to Report and Core
---
core/pom.xml | 6 ++++++
.../cz/muni/fi/pa165/core/config/AppConfig.java | 3 +++
report/pom.xml | 14 +++++++++++++-
.../fi/pa165/report/server/config/AppConfig.java | 3 +++
4 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/core/pom.xml b/core/pom.xml
index 031e611..05d16ba 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 e408ac3..4ea03e6 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 3f1cbc2..8594269 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 1083873..31261c2 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
--
GitLab