From da4af632f0729b2dee13de649601c00c0d129397 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Tue, 23 Nov 2021 13:57:28 +0000 Subject: [PATCH] Add version to check deploy configuration --- .../configuration/GlobalVars.java | 9 +++++++++ .../AuthorizationLibraryCheckDeployController.java | 3 +++ src/main/resources/authorization.properties | 9 ++------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/GlobalVars.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/GlobalVars.java index 28bf8c5..524b2c6 100644 --- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/GlobalVars.java +++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/GlobalVars.java @@ -8,6 +8,7 @@ import java.util.Date; public class GlobalVars { public static Date date = new Date(); private Date buildDate; + private String version; public String getBuildDate() { if(buildDate == null) { @@ -19,4 +20,12 @@ public class GlobalVars { public void setBuildDate(Date buildDate) { this.buildDate = buildDate; } + + public String getVersion() { + return this.version; + } + + public void setVersion(String version) { + this.version = version; + } } diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java index dc2ced7..9edec0b 100644 --- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java +++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java @@ -42,6 +42,9 @@ public class AuthorizationLibraryCheckDeployController { if(globalVars.getBuildDate() != null) { response.put("Date of build", globalVars.getBuildDate()); } + if (globalVars.getVersion() != null) { + response.put("Version", globalVars.getVersion()); + } return response; } } diff --git a/src/main/resources/authorization.properties b/src/main/resources/authorization.properties index a9f8608..840f197 100644 --- a/src/main/resources/authorization.properties +++ b/src/main/resources/authorization.properties @@ -1,9 +1,4 @@ #dev -authorization.security.userInfoUrl = http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken= +authorization.security.userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo authorization.globalVars.buildDate=@timestampAuthorizationLibrary@ - -#beta -#authorization.security.userInfoUrl = https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken= - -#production -#authorization.security.userInfoUrl = https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken= +authorization.globalVars.version=@project.version@