From f3e8114c660fc87a5bd77e6701ac29bcf5720c1c Mon Sep 17 00:00:00 2001 From: ThanKarab <tkarabatsis@hotmail.com> Date: Tue, 14 Jan 2020 09:41:57 +0000 Subject: [PATCH] minor fixes in parameters --- docker/config/application.tmpl | 4 ++-- .../eu/hbp/mip/configuration/SecurityConfiguration.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl index 2ade4524c..e34a00c0c 100644 --- a/docker/config/application.tmpl +++ b/docker/config/application.tmpl @@ -30,7 +30,7 @@ hbp: clientSecret: {{ .Env.CLIENT_SECRET }} accessTokenUri: {{ default .Env.TOKEN_URI "https://services.humanbrainproject.eu/oidc/token" }} userAuthorizationUri: {{ default .Env.AUTH_URI "https://services.humanbrainproject.eu/oidc/authorize" }} - logoutUri: {{ default .Env.LOGOUT_URI }} + logoutUri: {{ .Env.LOGOUT_URI }} tokenName: access_token authenticationScheme: query clientAuthenticationScheme: form @@ -89,4 +89,4 @@ services: galaxyPassword: {{ default .Env.GALAXY_PASSWORD "password" }} galaxyContext: {{ default .Env.GALAXY_CONTEXT "nativeGalaxy" }} keycloak: - keycloakUrl: {{ default .Env.KEYCLOAK_URL "localhost"}} + keycloakUrl: {{ .Env.KEYCLOAK_URL }} diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java index bf17e5564..1523aa1a8 100644 --- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java +++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java @@ -104,7 +104,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { /** * Absolute URL to redirect to when logout is required */ - @Value("#{'${hbp.client.logoutUri:http://88.197.53.10:8095/auth/realms/Demo/protocol/openid-connect/logout}'}") + @Value("#{'${hbp.client.logoutUri}'}") private String logoutUri; /** @@ -314,16 +314,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); // ãƒªã‚¯ã‚¨ã‚¹ãƒˆã‚’ä½œæˆ + UserActionLogging.LogAction("logoutUri is ", logoutUri); RequestEntity<MultiValueMap<String, String>> requestEntity = new RequestEntity<>(formParams, httpHeaders, HttpMethod.POST, - //URI.create("http://88.197.53.10:8095/auth/realms/Demo/protocol/openid-connect/logout")); //todo make this parameter - URI.create(logoutUri)); //todo make this parameter + URI.create(logoutUri)); // POSTリクエストé€ä¿¡ï¼ˆãƒã‚°ã‚¢ã‚¦ãƒˆå®Ÿè¡Œï¼‰ ResponseEntity<String> responseEntity = restTemplate.exchange(requestEntity, String.class); } - @Value("#{'${services.keycloak.keycloakUrl:88.197.53.10}'}") + @Value("#{'${services.keycloak.keycloakUrl}'}") private String keycloakUrl; // static { -- GitLab