You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/12/04 13:03:52 UTC
[isis] 08/08: ISIS-1297: KeycloakAuthenticator now correctly uses
the AuthenticationSessionWormhole threadlocal
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit be066d4749f38211ce65269fab1141e20fa1b164
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Dec 4 12:58:07 2019 +0000
ISIS-1297: KeycloakAuthenticator now correctly uses the AuthenticationSessionWormhole threadlocal
... and the thread-local in WebModuleKeycloak is now properly defunct and can be removed.
---
.../main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java | 2 --
.../isis/security/keycloak/authentication/KeycloakAuthenticator.java | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
index 945524c..29bc4fd 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/WebModuleKeycloak.java
@@ -43,8 +43,6 @@ import static org.apache.isis.commons.internal.exceptions._Exceptions.unexpected
@Order(Ordered.HIGHEST_PRECEDENCE + 100)
public final class WebModuleKeycloak implements WebModule {
- public final static ThreadLocal<AuthenticationSession> sessionByThread = new ThreadLocal<>();
-
private final static String KEYCLOAK_FILTER_CLASS_NAME =
KeycloakFilter.class.getName();
diff --git a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java
index fe6fb06..c1068bb 100644
--- a/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java
+++ b/core/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/KeycloakAuthenticator.java
@@ -28,6 +28,7 @@ import org.apache.isis.security.authentication.AuthenticationRequest;
import org.apache.isis.security.authentication.AuthenticationSession;
import org.apache.isis.security.authentication.standard.Authenticator;
import org.apache.isis.security.keycloak.WebModuleKeycloak;
+import org.apache.isis.webapp.wormhole.AuthenticationSessionWormhole;
@Log4j2 @NoArgsConstructor
public class KeycloakAuthenticator implements Authenticator {
@@ -53,7 +54,7 @@ public class KeycloakAuthenticator implements Authenticator {
@Override
public AuthenticationSession authenticate(final AuthenticationRequest request, final String code) {
- return WebModuleKeycloak.sessionByThread.get();
+ return AuthenticationSessionWormhole.sessionByThread.get();
}
@Override