diff --git a/pom.xml b/pom.xml
index 3b5a1cf..aa8be72 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
1.0.0
uoa-authorization-library
- 2.0.4-SNAPSHOT
+ 2.1.0-SNAPSHOT
jar
scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-authorization-library/trunk
diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/SecurityConfig.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/SecurityConfig.java
index 3fb9e58..3a21783 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/SecurityConfig.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/SecurityConfig.java
@@ -6,6 +6,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
public class SecurityConfig {
private String userInfoUrl;
+ private String session;
public String getUserInfoUrl() {
return userInfoUrl;
@@ -15,8 +16,11 @@ public class SecurityConfig {
this.userInfoUrl = userInfoUrl;
}
- /** @deprecated */
- public boolean isDeprecated() {
- return userInfoUrl.contains("accessToken");
+ public String getSession() {
+ return session;
+ }
+
+ public void setSession(String session) {
+ this.session = session;
}
}
diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java
index 9edec0b..ddc8a4e 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/controllers/AuthorizationLibraryCheckDeployController.java
@@ -36,6 +36,7 @@ public class AuthorizationLibraryCheckDeployController {
public Map checkEverything() {
Map response = new HashMap<>();
response.put("authorization.security.userInfoUrl", securityConfig.getUserInfoUrl());
+ response.put("authorization.security.session", securityConfig.getSession());
if(GlobalVars.date != null) {
response.put("Date of deploy", GlobalVars.date.toString());
}
diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java
index 6e401dd..abaa952 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java
@@ -17,37 +17,23 @@ import java.util.Collections;
public class AuthorizationUtils {
private final Logger log = Logger.getLogger(this.getClass());
private final SecurityConfig securityConfig;
- private final static String TOKEN = "AccessToken";
- private final static String SESSION = "OpenAIRESession";
@Autowired
AuthorizationUtils(SecurityConfig securityConfig) {
this.securityConfig = securityConfig;
}
- private String getToken(HttpServletRequest request) {
- if (request.getCookies() == null) {
- return null;
- }
- for (Cookie c : request.getCookies()) {
- if (c.getName().equals(TOKEN)) {
- return c.getValue();
- }
- }
- return null;
- }
-
public UserInfo getUserInfo(HttpServletRequest request) {
- String url = securityConfig.getUserInfoUrl() + (securityConfig.isDeprecated()?getToken(request):"");
+ String url = securityConfig.getUserInfoUrl();
RestTemplate restTemplate = new RestTemplate();
try {
if(hasCookie(request)) {
ResponseEntity response = restTemplate.exchange(url, HttpMethod.GET, createHeaders(request), UserInfo.class);
- return response.getBody();
+ return response.getBody();
}
return null;
} catch (RestClientException e) {
- log.error(url + ":" + e.getMessage());
+ log.error(url + ": " + e.getMessage());
return null;
}
}
@@ -55,11 +41,7 @@ public class AuthorizationUtils {
private boolean hasCookie(HttpServletRequest request) {
Cookie[] cookies = request.getCookies();
if(cookies != null) {
- if (securityConfig.isDeprecated()) {
- return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(TOKEN));
- } else {
- return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(SESSION));
- }
+ return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(this.securityConfig.getSession()));
}
return false;
}
diff --git a/src/main/resources/authorization.properties b/src/main/resources/authorization.properties
index 840f197..b8f0008 100644
--- a/src/main/resources/authorization.properties
+++ b/src/main/resources/authorization.properties
@@ -1,4 +1,5 @@
#dev
authorization.security.userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo
+authorization.security.session=openAIRESession
authorization.globalVars.buildDate=@timestampAuthorizationLibrary@
authorization.globalVars.version=@project.version@