Skip to content
Snippets Groups Projects
Commit 670c1ca6 authored by ThanKarab's avatar ThanKarab Committed by JerryPan44
Browse files

minor fixes in parameters

parent 95388f1a
No related branches found
No related tags found
1 merge request!7Features/keycloak integration
...@@ -30,7 +30,7 @@ hbp: ...@@ -30,7 +30,7 @@ hbp:
clientSecret: {{ .Env.CLIENT_SECRET }} clientSecret: {{ .Env.CLIENT_SECRET }}
accessTokenUri: {{ default .Env.TOKEN_URI "https://services.humanbrainproject.eu/oidc/token" }} accessTokenUri: {{ default .Env.TOKEN_URI "https://services.humanbrainproject.eu/oidc/token" }}
userAuthorizationUri: {{ default .Env.AUTH_URI "https://services.humanbrainproject.eu/oidc/authorize" }} userAuthorizationUri: {{ default .Env.AUTH_URI "https://services.humanbrainproject.eu/oidc/authorize" }}
logoutUri: {{ default .Env.LOGOUT_URI }} logoutUri: {{ .Env.LOGOUT_URI }}
tokenName: access_token tokenName: access_token
authenticationScheme: query authenticationScheme: query
clientAuthenticationScheme: form clientAuthenticationScheme: form
...@@ -89,4 +89,4 @@ services: ...@@ -89,4 +89,4 @@ services:
galaxyPassword: {{ default .Env.GALAXY_PASSWORD "password" }} galaxyPassword: {{ default .Env.GALAXY_PASSWORD "password" }}
galaxyContext: {{ default .Env.GALAXY_CONTEXT "nativeGalaxy" }} galaxyContext: {{ default .Env.GALAXY_CONTEXT "nativeGalaxy" }}
keycloak: keycloak:
keycloakUrl: {{ default .Env.KEYCLOAK_URL "localhost"}} keycloakUrl: {{ .Env.KEYCLOAK_URL }}
...@@ -104,7 +104,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -104,7 +104,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
/** /**
* Absolute URL to redirect to when logout is required * 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; private String logoutUri;
/** /**
...@@ -314,16 +314,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { ...@@ -314,16 +314,16 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
HttpHeaders httpHeaders = new HttpHeaders(); HttpHeaders httpHeaders = new HttpHeaders();
httpHeaders.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE); httpHeaders.add(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_FORM_URLENCODED_VALUE);
// リクエストを作成 // リクエストを作成
UserActionLogging.LogAction("logoutUri is ", logoutUri);
RequestEntity<MultiValueMap<String, String>> requestEntity = RequestEntity<MultiValueMap<String, String>> requestEntity =
new RequestEntity<>(formParams, httpHeaders, HttpMethod.POST, 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));
URI.create(logoutUri)); //todo make this parameter
// POSTリクエスト送信(ログアウト実行) // POSTリクエスト送信(ログアウト実行)
ResponseEntity<String> responseEntity = restTemplate.exchange(requestEntity, String.class); ResponseEntity<String> responseEntity = restTemplate.exchange(requestEntity, String.class);
} }
@Value("#{'${services.keycloak.keycloakUrl:88.197.53.10}'}") @Value("#{'${services.keycloak.keycloakUrl}'}")
private String keycloakUrl; private String keycloakUrl;
// static { // static {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment