From dee20d50edcb6e67261d7463c7a4127b909c7908 Mon Sep 17 00:00:00 2001 From: gkolokythas Date: Wed, 13 Nov 2019 17:34:39 +0200 Subject: [PATCH] Fixes bug on missing configuration on OpenAIRE login. --- .../customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java | 2 +- dmp-backend/web/src/main/resources/application-devel.properties | 2 +- .../web/src/main/resources/application-production.properties | 2 +- .../web/src/main/resources/application-staging.properties | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java index c8339fee7..cd465142f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/OpenAIRE/OpenAIRECustomProviderImpl.java @@ -27,7 +27,7 @@ public class OpenAIRECustomProviderImpl implements OpenAIRECustomProvider { HttpHeaders headers = this.createBearerAuthHeaders(accessToken); HttpEntity entity = new HttpEntity<>(headers); - Map values = restTemplate.exchange(this.environment.getProperty("openaire.login.userinfo_endpoint"), HttpMethod.GET, entity, Map.class).getBody(); + Map values = restTemplate.exchange(this.environment.getProperty("openaire.login.user_info_url"), HttpMethod.GET, entity, Map.class).getBody(); return new OpenAIREUser().getOpenAIREUser(values); } diff --git a/dmp-backend/web/src/main/resources/application-devel.properties b/dmp-backend/web/src/main/resources/application-devel.properties index f996c3546..cd1267a77 100644 --- a/dmp-backend/web/src/main/resources/application-devel.properties +++ b/dmp-backend/web/src/main/resources/application-devel.properties @@ -53,7 +53,7 @@ openaire.login.client_id= openaire.login.client_secret= openaire.login.access_token_url= openaire.login.redirect_uri= -openaire.login.userinfo_endpoint= +openaire.login.user_info_url= #############CONFIRMATION EMAIL CONFIGURATIONS######### conf_email.expiration_time_seconds=14400 diff --git a/dmp-backend/web/src/main/resources/application-production.properties b/dmp-backend/web/src/main/resources/application-production.properties index 2a5cb451e..9218ae216 100644 --- a/dmp-backend/web/src/main/resources/application-production.properties +++ b/dmp-backend/web/src/main/resources/application-production.properties @@ -71,7 +71,7 @@ openaire.login.client_id= openaire.login.client_secret= openaire.login.access_token_url= openaire.login.redirect_uri= -openaire.login.userinfo_endpoint= +openaire.login.user_info_url= #############SPRING DATASOURCE CONFIGURATIONS######### spring.datasource.maxIdle: 10 diff --git a/dmp-backend/web/src/main/resources/application-staging.properties b/dmp-backend/web/src/main/resources/application-staging.properties index 2f370c947..a4b4a0385 100644 --- a/dmp-backend/web/src/main/resources/application-staging.properties +++ b/dmp-backend/web/src/main/resources/application-staging.properties @@ -77,6 +77,7 @@ openaire.login.client_id= openaire.login.client_secret= openaire.login.access_token_url= openaire.login.redirect_uri= +openaire.login.user_info_url= #############ZENODO CONFIGURATIONS######### zenodo.url=https://sandbox.zenodo.org/api/