From 9b42b9bcfe97ea7392e78ca39d63756727590eda Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Thu, 14 Dec 2023 16:18:52 +0200
Subject: [PATCH] Add login core and import authentication configuration.

---
 pom.xml                                        | 18 ++++++++++++------
 .../IrishMonitorServiceApplication.java        | 10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6f0f8cb..a71c4a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,12 +23,18 @@
 </properties>
 <dependencies>
 
-        <dependency> <!-- this dependency includes dependency to uoa-monitor-service-library -->
-            <groupId>eu.dnetlib</groupId>
-            <artifactId>uoa-monitor-service</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
-            <classifier>library</classifier>
-        </dependency>
+    <dependency> <!-- this dependency includes dependency to uoa-monitor-service-library -->
+        <groupId>eu.dnetlib</groupId>
+        <artifactId>uoa-monitor-service</artifactId>
+        <version>1.0.4-SNAPSHOT</version>
+        <classifier>library</classifier>
+    </dependency>
+
+    <dependency>
+        <groupId>eu.dnetlib</groupId>
+        <artifactId>uoa-login-core</artifactId>
+        <version>2.1.1</version>
+    </dependency>
 
     <!--swagger-->
     <dependency>
diff --git a/src/main/java/eu/dnetlib/irishmonitorservice/IrishMonitorServiceApplication.java b/src/main/java/eu/dnetlib/irishmonitorservice/IrishMonitorServiceApplication.java
index d89f5db..1e0c0a9 100644
--- a/src/main/java/eu/dnetlib/irishmonitorservice/IrishMonitorServiceApplication.java
+++ b/src/main/java/eu/dnetlib/irishmonitorservice/IrishMonitorServiceApplication.java
@@ -1,5 +1,6 @@
 package eu.dnetlib.irishmonitorservice;
 
+import eu.dnetlib.authentication.configuration.AuthenticationConfiguration;
 import eu.dnetlib.irishmonitorservice.configuration.GlobalVars;
 import eu.dnetlib.irishmonitorservice.configuration.properties.APIProperties;
 import eu.dnetlib.uoamonitorservice.UoaMonitorServiceConfiguration;
@@ -9,18 +10,17 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.annotation.PropertySources;
-//uoahelptexts
+
 @SpringBootApplication(scanBasePackages = {"eu.dnetlib.irishmonitorservice"})
 @PropertySources({
-        @PropertySource("classpath:authorization.properties"),
         @PropertySource("classpath:admintoolslibrary.properties"),
-//        @PropertySource("classpath:notification.properties"),
+        @PropertySource("classpath:authentication.properties"),
         @PropertySource("classpath:monitorservice.properties"),
         @PropertySource("classpath:irishmonitorservice.properties"),
         @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
 })
-@EnableConfigurationProperties({ GlobalVars.class, APIProperties.class})
-@Import({UoaMonitorServiceConfiguration.class})
+@EnableConfigurationProperties({GlobalVars.class, APIProperties.class})
+@Import({UoaMonitorServiceConfiguration.class, AuthenticationConfiguration.class})
 public class IrishMonitorServiceApplication {
     public static void main(String[] args) {
         SpringApplication.run(IrishMonitorServiceApplication.class, args);