[Trunk | Authorization Service]:

1. pom.xml: 
        a. Added timestamp in properties.
        b. In <build> added <resources> with filtering set to true.
2. GlobalVars.java: Added GlobalVars class for date of deploy & date of build.
3. AuthorizationConfiguration.java: In @EnableConfigurationProperties added GlobalVars.class.
4. AuthorizationLibraryCheckDeployController.java: Added exposing date of deploy and date of build.
5. authorization.properties: Added property authorization.globalVars.buildDate=@timestamp@
master
Konstantina Galouni 3 years ago
parent 8a52aea7b6
commit 4dff8c29c3

@ -21,6 +21,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<timestampAuthorizationLibrary>${maven.build.timestamp}</timestampAuthorizationLibrary>
<maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
</properties>
<dependencies>
@ -54,5 +56,11 @@
<plugins>
</plugins>
<finalName>uoa-authorization-library</finalName>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</resource>
</resources>
</build>
</project>

@ -8,6 +8,6 @@ import org.springframework.context.annotation.*;
// @PropertySource("classpath:authorization.properties"),
// @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
//})
@EnableConfigurationProperties({SecurityConfig.class})
@EnableConfigurationProperties({SecurityConfig.class, GlobalVars.class})
@ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" })
public class AuthorizationConfiguration { }

@ -0,0 +1,22 @@
package eu.dnetlib.uoaauthorizationlibrary.configuration;
import org.springframework.boot.context.properties.ConfigurationProperties;
import java.util.Date;
@ConfigurationProperties("authorization.globalVars")
public class GlobalVars {
public static Date date = new Date();
private Date buildDate;
public String getBuildDate() {
if(buildDate == null) {
return null;
}
return buildDate.toString();
}
public void setBuildDate(Date buildDate) {
this.buildDate = buildDate;
}
}

@ -1,6 +1,7 @@
package eu.dnetlib.uoaauthorizationlibrary.controllers;
import eu.dnetlib.uoaauthorizationlibrary.configuration.AuthorizationConfiguration;
import eu.dnetlib.uoaauthorizationlibrary.configuration.GlobalVars;
import eu.dnetlib.uoaauthorizationlibrary.configuration.SecurityConfig;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,6 +23,9 @@ public class AuthorizationLibraryCheckDeployController {
@Autowired
private SecurityConfig securityConfig;
@Autowired
private GlobalVars globalVars;
@RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)
public String hello() {
log.debug("Hello from uoa-authorization-service!");
@ -36,6 +40,13 @@ public class AuthorizationLibraryCheckDeployController {
response.put("authorization.security.userInfoUrl", securityConfig.getUserInfoUrl());
response.put("authorization.security.originServer", securityConfig.getOriginServer());
if(globalVars.date != null) {
response.put("Date of deploy", globalVars.date.toString());
}
if(globalVars.getBuildDate() != null) {
response.put("Date of build", globalVars.getBuildDate());
}
return response;
}
}

@ -1,6 +1,7 @@
#dev
authorization.security.userInfoUrl = http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=
authorization.security.originServer = di.uoa.gr
authorization.globalVars.buildDate=@timestampAuthorizationLibrary@
#beta
#authorization.security.userInfoUrl = https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=

Loading…
Cancel
Save