From bbef37a2223feca4153c4a63f9ce77b12dfb6cf6 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Mon, 9 Aug 2021 15:08:46 -0400 Subject: [PATCH] refactored --- ...entScanner.java => KeycloakExtSpringComponentScanner.java} | 4 ++-- .../java/com/inteligr8/activiti/{ais => }/Authenticator.java | 2 +- .../ais/AbstractIdentityServiceActivitiAuthenticator.java | 1 + .../activiti/ais/IdentityServiceActivitiAppAuthenticator.java | 1 + .../ais/IdentityServiceActivitiEngineAuthenticator.java | 2 ++ .../ais/IdentityServiceAuthenticationProviderAdapter.java | 1 + .../ais/IdentityServiceSecurityConfigurationAdapter.java | 1 + .../InterceptingIdentityServiceAuthenticationProvider.java | 1 + 8 files changed, 10 insertions(+), 3 deletions(-) rename src/main/java/com/activiti/extension/conf/{OidcExtSpringComponentScanner.java => KeycloakExtSpringComponentScanner.java} (59%) rename src/main/java/com/inteligr8/activiti/{ais => }/Authenticator.java (91%) diff --git a/src/main/java/com/activiti/extension/conf/OidcExtSpringComponentScanner.java b/src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java similarity index 59% rename from src/main/java/com/activiti/extension/conf/OidcExtSpringComponentScanner.java rename to src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java index b53a694..2ee46b1 100644 --- a/src/main/java/com/activiti/extension/conf/OidcExtSpringComponentScanner.java +++ b/src/main/java/com/activiti/extension/conf/KeycloakExtSpringComponentScanner.java @@ -4,7 +4,7 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan(basePackages = {"com.inteligr8.activiti.oidc"}) -public class OidcExtSpringComponentScanner { +@ComponentScan(basePackages = {"com.inteligr8.activiti.ais"}) +public class KeycloakExtSpringComponentScanner { } diff --git a/src/main/java/com/inteligr8/activiti/ais/Authenticator.java b/src/main/java/com/inteligr8/activiti/Authenticator.java similarity index 91% rename from src/main/java/com/inteligr8/activiti/ais/Authenticator.java rename to src/main/java/com/inteligr8/activiti/Authenticator.java index cfa145f..6ef403d 100644 --- a/src/main/java/com/inteligr8/activiti/ais/Authenticator.java +++ b/src/main/java/com/inteligr8/activiti/Authenticator.java @@ -1,4 +1,4 @@ -package com.inteligr8.activiti.ais; +package com.inteligr8.activiti; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; diff --git a/src/main/java/com/inteligr8/activiti/ais/AbstractIdentityServiceActivitiAuthenticator.java b/src/main/java/com/inteligr8/activiti/ais/AbstractIdentityServiceActivitiAuthenticator.java index dc8426e..f73d569 100644 --- a/src/main/java/com/inteligr8/activiti/ais/AbstractIdentityServiceActivitiAuthenticator.java +++ b/src/main/java/com/inteligr8/activiti/ais/AbstractIdentityServiceActivitiAuthenticator.java @@ -15,6 +15,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.GrantedAuthority; import com.activiti.security.identity.service.authentication.provider.IdentityServiceAuthenticationToken; +import com.inteligr8.activiti.Authenticator; public abstract class AbstractIdentityServiceActivitiAuthenticator implements Authenticator { diff --git a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiAppAuthenticator.java b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiAppAuthenticator.java index ccde6b3..a8e99ba 100644 --- a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiAppAuthenticator.java +++ b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiAppAuthenticator.java @@ -24,6 +24,7 @@ import com.activiti.service.api.GroupService; import com.activiti.service.api.UserService; import com.activiti.service.idm.TenantService; import com.activiti.service.license.LicenseService; +import com.inteligr8.activiti.Authenticator; /** * This class/bean implements an Open ID Connect authenticator for Alfresco diff --git a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiEngineAuthenticator.java b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiEngineAuthenticator.java index f9c6f3f..ad02ad8 100644 --- a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiEngineAuthenticator.java +++ b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceActivitiEngineAuthenticator.java @@ -15,6 +15,8 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.stereotype.Component; +import com.inteligr8.activiti.Authenticator; + /** * This is an unused implementation for non-APS installation. It is not tested * and probably pointless. diff --git a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceAuthenticationProviderAdapter.java b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceAuthenticationProviderAdapter.java index ad6c2b9..f74ef19 100644 --- a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceAuthenticationProviderAdapter.java +++ b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceAuthenticationProviderAdapter.java @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.security.authentication.AuthenticationProvider; import com.activiti.api.security.AlfrescoAuthenticationProviderOverride; +import com.inteligr8.activiti.Authenticator; /** * FIXME This would be nice, but with AIS enabled, it is never called. The use diff --git a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceSecurityConfigurationAdapter.java b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceSecurityConfigurationAdapter.java index eb89481..f729886 100644 --- a/src/main/java/com/inteligr8/activiti/ais/IdentityServiceSecurityConfigurationAdapter.java +++ b/src/main/java/com/inteligr8/activiti/ais/IdentityServiceSecurityConfigurationAdapter.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; import com.activiti.api.msmt.MsmtTenantResolver; import com.activiti.api.security.AlfrescoSecurityConfigOverride; import com.activiti.conf.MsmtProperties; +import com.inteligr8.activiti.Authenticator; /** * This class/bean overrides the AIS authentication provider, enabling a more diff --git a/src/main/java/com/inteligr8/activiti/ais/InterceptingIdentityServiceAuthenticationProvider.java b/src/main/java/com/inteligr8/activiti/ais/InterceptingIdentityServiceAuthenticationProvider.java index 0244023..bde2786 100644 --- a/src/main/java/com/inteligr8/activiti/ais/InterceptingIdentityServiceAuthenticationProvider.java +++ b/src/main/java/com/inteligr8/activiti/ais/InterceptingIdentityServiceAuthenticationProvider.java @@ -6,6 +6,7 @@ import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import com.activiti.security.identity.service.authentication.provider.IdentityServiceAuthenticationProvider; +import com.inteligr8.activiti.Authenticator; /** * This class/bean extends the APS AIS OOTB authentication provider. It uses