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 2021/06/09 05:56:53 UTC
[isis] 03/05: ISIS-2727: renames variables of type
'AuthenticationContext'
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2727
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 8ddca9c602f7c7859ffba5d58464cf2ec56c8eef
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Wed Jun 9 06:46:26 2021 +0100
ISIS-2727: renames variables of type 'AuthenticationContext'
---
.../isis/core/security/authentication/AuthenticationProvider.java | 6 ++++--
.../apache/isis/core/security/authentication/logout/LogoutMenu.java | 4 ++--
.../src/main/java/org/apache/isis/core/security/util/XrayUtil.java | 4 ++--
.../security/keycloak/authentication/AuthenticatorKeycloak.java | 4 ++--
.../isis/security/spring/authentication/AuthenticatorSpring.java | 4 ++--
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationProvider.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationProvider.java
index 440f9fb..d285108 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationProvider.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/AuthenticationProvider.java
@@ -43,11 +43,13 @@ public interface AuthenticationProvider {
return currentAuthentication()
.orElseThrow(()->
_Exceptions.illegalState(
- "no InteractionSession available on current %s",
+ "no InteractionLayer available on current %s",
_Probe.currentThreadId()));
}
- /** authentication-layer-stack size */
+ /**
+ * interaction-layer-stack size
+ * */
int getInteractionLayerCount();
}
diff --git a/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java b/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java
index aa4b3f5..2e33209 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/authentication/logout/LogoutMenu.java
@@ -51,7 +51,7 @@ public class LogoutMenu {
public static final String LOGICAL_TYPE_NAME = IsisModuleCoreSecurity.NAMESPACE + ".LogoutMenu"; // referenced by secman seeding
private final List<LogoutHandler> logoutHandler;
- private final AuthenticationProvider authenticationTracker;
+ private final AuthenticationProvider authenticationProvider;
//private final IsisConfiguration configuration;
public static class LogoutDomainEvent
@@ -73,7 +73,7 @@ public class LogoutMenu {
}
private Object getRedirect() {
- val redirect = authenticationTracker.currentAuthentication()
+ val redirect = authenticationProvider.currentAuthentication()
.map(authentication->
authentication.getType() == Authentication.Type.EXTERNAL
? "logout"
diff --git a/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java b/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java
index 9d54a23..84780a8 100644
--- a/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java
+++ b/core/security/src/main/java/org/apache/isis/core/security/util/XrayUtil.java
@@ -66,14 +66,14 @@ public final class XrayUtil {
public static Optional<SequenceHandle> createSequenceHandle(
final @NonNull InteractionProvider iaContext,
- final @NonNull AuthenticationProvider authContext,
+ final @NonNull AuthenticationProvider authenticationProvider,
final String ... callees) {
if(!iaContext.isInInteraction()) {
return Optional.empty();
}
- final int authStackSize = authContext.getInteractionLayerCount();
+ final int authStackSize = authenticationProvider.getInteractionLayerCount();
val interactionId = iaContext.getInteractionId().orElseThrow(_Exceptions::unexpectedCodeReach);
val handle = SequenceHandle.builder()
diff --git a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
index c20278c..5da1e3d 100644
--- a/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
+++ b/security/keycloak/src/main/java/org/apache/isis/security/keycloak/authentication/AuthenticatorKeycloak.java
@@ -42,7 +42,7 @@ import org.apache.isis.core.security.authentication.Authenticator;
@Singleton
public class AuthenticatorKeycloak implements Authenticator {
- @Inject private AuthenticationProvider authenticationTracker;
+ @Inject private AuthenticationProvider authenticationProvider;
@Override
public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
@@ -52,7 +52,7 @@ public class AuthenticatorKeycloak implements Authenticator {
@Override
public Authentication authenticate(final AuthenticationRequest request, final String code) {
// HTTP request filters should already have taken care of Authentication creation
- return authenticationTracker.currentAuthentication().orElse(null);
+ return authenticationProvider.currentAuthentication().orElse(null);
}
@Override
diff --git a/security/spring/src/main/java/org/apache/isis/security/spring/authentication/AuthenticatorSpring.java b/security/spring/src/main/java/org/apache/isis/security/spring/authentication/AuthenticatorSpring.java
index 0d64203..bfc254b 100644
--- a/security/spring/src/main/java/org/apache/isis/security/spring/authentication/AuthenticatorSpring.java
+++ b/security/spring/src/main/java/org/apache/isis/security/spring/authentication/AuthenticatorSpring.java
@@ -41,7 +41,7 @@ import org.apache.isis.core.security.authentication.Authenticator;
@Qualifier("Spring")
public class AuthenticatorSpring implements Authenticator {
- @Inject private AuthenticationProvider authenticationTracker;
+ @Inject private AuthenticationProvider authenticationProvider;
@Override
public final boolean canAuthenticate(final Class<? extends AuthenticationRequest> authenticationRequestClass) {
@@ -51,7 +51,7 @@ public class AuthenticatorSpring implements Authenticator {
@Override
public Authentication authenticate(final AuthenticationRequest request, final String code) {
// SpringSecurityFilter should already have taken care of Authentication creation
- return authenticationTracker.currentAuthentication().orElse(null);
+ return authenticationProvider.currentAuthentication().orElse(null);
}
@Override