Cleanup

apache · Jan 28, 2025 · 1a3d015 · 1a3d015
1 parent 94ed08e
commit 1a3d015
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 357 deletions.
diff --git a/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/SAML2SP4UILogic.java b/ext/saml2sp4ui/logic/src/main/java/org/apache/syncope/core/logic/SAML2SP4UILogic.java
@@ -49,7 +49,6 @@
 import org.apache.syncope.core.logic.saml2.NoOpSessionStore;
 import org.apache.syncope.core.logic.saml2.SAML2ClientCache;
 import org.apache.syncope.core.logic.saml2.SAML2SP4UIContext;
-import org.apache.syncope.core.logic.saml2.SAML2SP4UIFrameworkAdapter;
 import org.apache.syncope.core.logic.saml2.SAML2SP4UIUserManager;
 import org.apache.syncope.core.persistence.api.dao.NotFoundException;
 import org.apache.syncope.core.persistence.api.dao.SAML2SP4UIIdPDAO;
@@ -71,7 +70,6 @@
 import org.opensaml.saml.saml2.metadata.AssertionConsumerService;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 import org.opensaml.saml.saml2.metadata.impl.AssertionConsumerServiceBuilder;
-import org.pac4j.core.config.Config;
 import org.pac4j.core.context.CallContext;
 import org.pac4j.core.credentials.Credentials;
 import org.pac4j.core.exception.http.RedirectionAction;
@@ -139,8 +137,6 @@ public SAML2SP4UILogic(
         this.userManager = userManager;
         this.idpDAO = idpDAO;
         this.authDataAccessor = authDataAccessor;
-
-        SAML2SP4UIFrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(new Config());
     }
 
     protected static String validateUrl(final String url) {

diff --git a/...p4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/NoOpSessionStoreFactory.java b/...p4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/NoOpSessionStoreFactory.java
diff --git a/...4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIContextFactory.java b/...4ui/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIContextFactory.java
diff --git a/...c/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIContextFrameworkParameters.java b/...c/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIContextFrameworkParameters.java
diff --git a/...i/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIFrameworkAdapter.java b/...i/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIFrameworkAdapter.java
diff --git a/.../logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIHttpActionAdapter.java b/.../logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2SP4UIHttpActionAdapter.java
diff --git a/fit/wa-reference/src/test/java/org/apache/syncope/fit/ui/SAML2SP4UIITCase.java b/fit/wa-reference/src/test/java/org/apache/syncope/fit/ui/SAML2SP4UIITCase.java
@@ -242,10 +242,6 @@ protected void sso(final String baseURL, final String username, final String pas
 
         // 2c. WA attribute consent screen
         if (isOk) {
-            // check attribute repository
-            assertTrue(responseBody.contains("identifier"));
-            assertTrue(responseBody.contains("[value1]"));
-
             String execution = extractWAExecution(responseBody);
 
             List<NameValuePair> form = new ArrayList<>();

diff --git a/sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java b/sra/src/main/java/org/apache/syncope/sra/SecurityConfig.java
@@ -37,9 +37,7 @@
 import org.apache.syncope.sra.security.saml2.SAML2SecurityConfigUtils;
 import org.apache.syncope.sra.security.saml2.SAML2WebSsoAuthenticationWebFilter;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.pac4j.core.config.Config;
 import org.pac4j.core.http.callback.NoParameterCallbackUrlResolver;
-import org.pac4j.jee.adapter.JEEFrameworkAdapter;
 import org.pac4j.saml.client.SAML2Client;
 import org.pac4j.saml.config.SAML2Configuration;
 import org.pac4j.saml.metadata.keystore.BaseSAML2KeystoreGenerator;
@@ -251,8 +249,6 @@ public ReactiveJwtDecoder oauth2JWTDecoder(
     @ConditionalOnMissingBean
     @ConditionalOnProperty(prefix = SRAProperties.PREFIX, name = SRAProperties.AM_TYPE, havingValue = "SAML2")
     public SAML2Client saml2Client(final ResourcePatternResolver resourceResolver, final SRAProperties props) {
-        JEEFrameworkAdapter.INSTANCE.applyDefaultSettingsIfUndefined(new Config());
-
         SAML2Configuration cfg = new SAML2Configuration(
                 resourceResolver.getResource(props.getSaml2().getKeystore()),
                 null,

diff --git a/sra/src/main/java/org/apache/syncope/sra/security/pac4j/NoOpSessionStoreFactory.java b/sra/src/main/java/org/apache/syncope/sra/security/pac4j/NoOpSessionStoreFactory.java
diff --git a/sra/src/main/java/org/apache/syncope/sra/security/pac4j/ServerWebExchangeContextFactory.java b/sra/src/main/java/org/apache/syncope/sra/security/pac4j/ServerWebExchangeContextFactory.java
diff --git a/...main/java/org/apache/syncope/sra/security/pac4j/ServerWebExchangeFrameworkParameters.java b/...main/java/org/apache/syncope/sra/security/pac4j/ServerWebExchangeFrameworkParameters.java