From 071465bebde8075ec33c50a6e5e1d9f0ed156339 Mon Sep 17 00:00:00 2001
From: unknown <Jerrypan44@gmail.com>
Date: Wed, 6 Nov 2019 14:48:25 +0200
Subject: [PATCH] keycloak wip
---
.../mip/configuration/KeycloakConfiguration.java | 14 ++++++++++++++
.../mip/configuration/SecurityConfiguration.java | 6 +++---
2 files changed, 17 insertions(+), 3 deletions(-)
create mode 100644 src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java
diff --git a/src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java b/src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java
new file mode 100644
index 000000000..45c598924
--- /dev/null
+++ b/src/main/java/eu/hbp/mip/configuration/KeycloakConfiguration.java
@@ -0,0 +1,14 @@
+package eu.hbp.mip.configuration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import org.keycloak.KeycloakSecurityContext;
+
+public class KeycloakConfiguration {
+
+ @Autowired
+ private HttpServletRequest request;
+ public KeycloakSecurityContext getKeycloakSecurityContext() {
+ return (KeycloakSecurityContext) request.getAttribute(KeycloakSecurityContext.class.getName());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
index adacd7a81..3d0a49357 100644
--- a/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
+++ b/src/main/java/eu/hbp/mip/configuration/SecurityConfiguration.java
@@ -88,8 +88,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Value("#{'${hbp.resource.revokeTokenUri:https://services.humanbrainproject.eu/oidc/revoke}'}")
private String revokeTokenURI;
- @Autowired
- private HttpServletRequest request;
+// @Autowired
+// private HttpServletRequest request;
@Override
protected void configure(HttpSecurity http) throws Exception {
@@ -112,7 +112,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
}
else {
//keycloak
- (KeycloakSecurityContext) request.getAttribute(KeycloakSecurityContext.class.getName());
+ KeycloakConfiguration.getKeycloakSecurityContext();
// http.antMatcher("/**")
// .authorizeRequests()
// .antMatchers("/**").permitAll().and().csrf().disable();
--
GitLab