Compare commits
4 Commits
login-serv
...
master
Author | SHA1 | Date |
---|---|---|
Konstantinos Triantafyllou | 1adfe4eb5f | |
Konstantinos Triantafyllou | 38b3324270 | |
Konstantinos Triantafyllou | b79862b825 | |
Konstantinos Triantafyllou | 58ee81d77b |
8
pom.xml
8
pom.xml
|
@ -15,11 +15,17 @@
|
||||||
<developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/login-service.git</developerConnection>
|
<developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/login-service.git</developerConnection>
|
||||||
<tag>HEAD</tag>
|
<tag>HEAD</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
<properties>
|
||||||
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
|
<timestamp>${maven.build.timestamp}</timestamp>
|
||||||
|
<maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
|
||||||
|
</properties>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>uoa-login-core</artifactId>
|
<artifactId>uoa-login-core</artifactId>
|
||||||
<version>2.0.2</version>
|
<version>2.1.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--swagger-->
|
<!--swagger-->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -1,8 +1,11 @@
|
||||||
package eu.dnetlib.loginservice;
|
package eu.dnetlib.loginservice;
|
||||||
|
|
||||||
import eu.dnetlib.authentication.configuration.AuthenticationConfiguration;
|
import eu.dnetlib.authentication.configuration.AuthenticationConfiguration;
|
||||||
|
import eu.dnetlib.loginservice.configuration.APIProperties;
|
||||||
|
import eu.dnetlib.loginservice.configuration.GlobalVars;
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
||||||
import org.springframework.context.annotation.Import;
|
import org.springframework.context.annotation.Import;
|
||||||
import org.springframework.context.annotation.PropertySource;
|
import org.springframework.context.annotation.PropertySource;
|
||||||
import org.springframework.context.annotation.PropertySources;
|
import org.springframework.context.annotation.PropertySources;
|
||||||
|
@ -14,6 +17,7 @@ import org.springframework.context.annotation.PropertySources;
|
||||||
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
||||||
})
|
})
|
||||||
@Import({AuthenticationConfiguration.class})
|
@Import({AuthenticationConfiguration.class})
|
||||||
|
@EnableConfigurationProperties({APIProperties.class, GlobalVars.class})
|
||||||
public class LoginServiceApplication {
|
public class LoginServiceApplication {
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
|
|
|
@ -0,0 +1,38 @@
|
||||||
|
package eu.dnetlib.loginservice.configuration;
|
||||||
|
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
|
@ConfigurationProperties("api")
|
||||||
|
public class APIProperties {
|
||||||
|
|
||||||
|
private String title;
|
||||||
|
private String description;
|
||||||
|
private String version;
|
||||||
|
|
||||||
|
public APIProperties() {
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getTitle() {
|
||||||
|
return title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTitle(String title) {
|
||||||
|
this.title = title;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getDescription() {
|
||||||
|
return description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setDescription(String description) {
|
||||||
|
this.description = description;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVersion() {
|
||||||
|
return version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVersion(String version) {
|
||||||
|
this.version = version;
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,31 @@
|
||||||
|
package eu.dnetlib.loginservice.configuration;
|
||||||
|
|
||||||
|
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
@ConfigurationProperties("login-service.globalVars")
|
||||||
|
public class GlobalVars {
|
||||||
|
public static Date date = new Date();
|
||||||
|
private Date buildDate;
|
||||||
|
private String version;
|
||||||
|
|
||||||
|
public String getBuildDate() {
|
||||||
|
if(buildDate == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return buildDate.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setBuildDate(Date buildDate) {
|
||||||
|
this.buildDate = buildDate;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getVersion() {
|
||||||
|
return version;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVersion(String version) {
|
||||||
|
this.version = version;
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,6 +1,5 @@
|
||||||
package eu.dnetlib.loginservice.configuration;
|
package eu.dnetlib.loginservice.configuration;
|
||||||
|
|
||||||
import eu.dnetlib.authentication.configuration.APIProperties;
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package eu.dnetlib.loginservice.controllers;
|
package eu.dnetlib.loginservice.controllers;
|
||||||
|
|
||||||
import eu.dnetlib.authentication.configuration.AuthenticationConfiguration;
|
import eu.dnetlib.loginservice.configuration.GlobalVars;
|
||||||
import eu.dnetlib.authentication.configuration.Properties;
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
|
@ -10,16 +9,17 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestMethod;
|
import org.springframework.web.bind.annotation.RequestMethod;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import org.springframework.web.bind.annotation.RestController;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@RestController
|
@RestController
|
||||||
public class HealthController {
|
public class HealthController {
|
||||||
private final Logger log = LogManager.getLogger(this.getClass());
|
private final Logger log = LogManager.getLogger(this.getClass());
|
||||||
private final AuthenticationConfiguration configuration;
|
private final GlobalVars globalVars;
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
public HealthController(AuthenticationConfiguration configuration) {
|
public HealthController(GlobalVars globalVars) {
|
||||||
this.configuration = configuration;
|
this.globalVars = globalVars;
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)
|
@RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)
|
||||||
|
@ -31,6 +31,16 @@ public class HealthController {
|
||||||
@PreAuthorize("hasAnyAuthority('PORTAL_ADMINISTRATOR')")
|
@PreAuthorize("hasAnyAuthority('PORTAL_ADMINISTRATOR')")
|
||||||
@RequestMapping(value = "/health_check/advanced", method = RequestMethod.GET)
|
@RequestMapping(value = "/health_check/advanced", method = RequestMethod.GET)
|
||||||
public Map<String, String> checkEverything() {
|
public Map<String, String> checkEverything() {
|
||||||
return configuration.getProperties();
|
Map<String, String> response = new HashMap<>();
|
||||||
|
if(GlobalVars.date != null) {
|
||||||
|
response.put("Date of deploy", eu.dnetlib.authentication.configuration.GlobalVars.date.toString());
|
||||||
|
}
|
||||||
|
if(globalVars.getBuildDate() != null) {
|
||||||
|
response.put("Date of build", globalVars.getBuildDate());
|
||||||
|
}
|
||||||
|
if (globalVars.getVersion() != null) {
|
||||||
|
response.put("Version", globalVars.getVersion());
|
||||||
|
}
|
||||||
|
return response;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,3 +2,6 @@
|
||||||
api.title = Login Service
|
api.title = Login Service
|
||||||
api.description = Login service provides methods to authenticate users through AAI provider and retrieve information of authenticated user.
|
api.description = Login service provides methods to authenticate users through AAI provider and retrieve information of authenticated user.
|
||||||
api.version = ${project.version}
|
api.version = ${project.version}
|
||||||
|
|
||||||
|
login-service.global-vars.buildDate=@timestamp@
|
||||||
|
login-service.global-vars.version=@project.version@
|
||||||
|
|
Loading…
Reference in New Issue