Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
portal-backend
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
HBP Medical Informatics Platform
portal-backend
Commits
f3e8114c
Commit
f3e8114c
authored
5 years ago
by
ThanKarab
Browse files
Options
Downloads
Patches
Plain Diff
minor fixes in parameters
parent
8d9fd5dc
No related branches found
No related tags found
1 merge request
!7
Features/keycloak integration
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
docker/config/application.tmpl
+2
-2
2 additions, 2 deletions
docker/config/application.tmpl
src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+4
-4
4 additions, 4 deletions
.../java/eu/hbp/mip/configuration/SecurityConfiguration.java
with
6 additions
and
6 deletions
docker/config/application.tmpl
+
2
−
2
View file @
f3e8114c
...
...
@@ -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 }}
This diff is collapsed.
Click to expand it.
src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+
4
−
4
View file @
f3e8114c
...
...
@@ -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 {
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment