Remove CIBA push auth related classes and configs

wso2 · Dec 20, 2024 · ef22366 · ef22366
1 parent 605a82a
commit ef22366
Show file tree

Hide file tree

Showing 25 changed files with 2 additions and 2,010 deletions.
diff --git a/...ob-is/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2 b/...ob-is/carbon-home/repository/resources/conf/templates/repository/conf/open-banking.xml.j2
@@ -141,17 +141,6 @@
             </IdentityCache>
         </Cache>
 
-        <CIBAAuthenticationEndpointWebApp>
-            {% if open_banking.identity.ciba_webapp.servlet_extension is defined %}
-                <ServletExtension>
-                    {{open_banking.identity.ciba_webapp.servlet_extension}}
-                </ServletExtension>
-            {% else %}
-                <ServletExtension>
-                    com.wso2.openbanking.accelerator.consent.extensions.ciba.impl.CIBAAuthenticationEndpointDefaultImpl
-                </ServletExtension>
-            {% endif %}
-        </CIBAAuthenticationEndpointWebApp>
         <CIBA>
             <AuthWebLink>
                 {% if open_banking.identity.ciba.auth_web_link.redirect_endpoint is defined %}

diff --git a/...g.accelerator.ciba/src/main/java/com.wso2.openbanking.accelerator.ciba/CIBAConstants.java b/...g.accelerator.ciba/src/main/java/com.wso2.openbanking.accelerator.ciba/CIBAConstants.java
@@ -21,7 +21,6 @@
 /**
  * CIBA Test Constants class.
  */
-@Deprecated
 public class CIBAConstants {
 
     public static final String INVALID_REQUEST = "invalid_request";

diff --git a/...a/com.wso2.openbanking.accelerator.ciba/OBCIBASignatureAlgorithmEnforcementValidator.java b/...a/com.wso2.openbanking.accelerator.ciba/OBCIBASignatureAlgorithmEnforcementValidator.java
@@ -28,7 +28,6 @@
 /**
  * CIBA Signature Algorithm Enforcer class
  */
-@Deprecated
 public class OBCIBASignatureAlgorithmEnforcementValidator extends SignatureAlgorithmEnforcementValidator {
 
     /**

diff --git a/...ava/com/wso2/openbanking/accelerator/ciba/OBCIBARequestObjectValidationExtensionTest.java b/...ava/com/wso2/openbanking/accelerator/ciba/OBCIBARequestObjectValidationExtensionTest.java
@@ -43,7 +43,6 @@
 /**
  * Test class for OBCIBARequestObjectValidationExtension.
  */
-@Deprecated
 @PowerMockIgnore("jdk.internal.reflect.*")
 @PrepareForTest({JWTClaimsSet.class, OAuth2Parameters.class, RequestObject.class, JSONObject.class,
         IdentityExtensionsDataHolder.class})

diff --git a/...src/main/java/com/wso2/openbanking/accelerator/common/config/OpenBankingConfigParser.java b/...src/main/java/com/wso2/openbanking/accelerator/common/config/OpenBankingConfigParser.java
@@ -885,18 +885,6 @@ public String getAuthServletExtension() {
                 ((String) getConfigElementFromKey(OpenBankingConstants.AUTH_SERVLET_EXTENSION)).trim();
     }
 
-    /**
-     * Gets the configured CIBA servlet extention implementation.
-     *
-     * @deprecated will be removed in the future versions when moving to newer ciba implementation.
-     * @return
-     */
-    @Deprecated
-    public String getCibaServletExtension() {
-        return getConfigElementFromKey(OpenBankingConstants.CIBA_SERVLET_EXTENSION) == null ? "" :
-                ((String) getConfigElementFromKey(OpenBankingConstants.CIBA_SERVLET_EXTENSION)).trim();
-    }
-
     public String getJWKSConnectionTimeOut() {
 
         return getConfigElementFromKey(OpenBankingConstants.DCR_JWKS_CONNECTION_TIMEOUT) == null ? "3000" :

diff --git a/...ommon/src/test/java/com/wso2/openbanking/accelerator/common/test/OBConfigParserTests.java b/...ommon/src/test/java/com/wso2/openbanking/accelerator/common/test/OBConfigParserTests.java
@@ -196,16 +196,6 @@ public void testGetAuthServletExtension() {
         Assert.assertEquals(authServletExtension, "sampleServletExtension");
     }
 
-    @Test (priority = 11)
-    public void testGetEmptyCibaServletExtension() {
-
-        String dummyConfigFile = absolutePathForTestResources + "/open-banking.xml";
-        String authServletExtension = OpenBankingConfigParser.getInstance(dummyConfigFile)
-                .getCibaServletExtension();
-
-        Assert.assertEquals(authServletExtension, "sampleCIBAServletExtension");
-    }
-
     @Test (priority = 12)
     public void testGetJWKSConnectionTimeout() {
 

diff --git a/.../openbanking/accelerator/consent/extensions/ciba/authenticator/CIBAPushAuthenticator.java b/.../openbanking/accelerator/consent/extensions/ciba/authenticator/CIBAPushAuthenticator.java
diff --git a/...ing/accelerator/consent/extensions/ciba/authenticator/CIBAPushAuthenticatorConstants.java b/...ing/accelerator/consent/extensions/ciba/authenticator/CIBAPushAuthenticatorConstants.java
diff --git a/.../consent/extensions/ciba/authenticator/weblink/CIBAWebLinkAuthenticatorExtensionImpl.java b/.../consent/extensions/ciba/authenticator/weblink/CIBAWebLinkAuthenticatorExtensionImpl.java
@@ -13,7 +13,6 @@
 import com.wso2.openbanking.accelerator.common.constant.OpenBankingConstants;
 import com.wso2.openbanking.accelerator.common.exception.ConsentManagementException;
 import com.wso2.openbanking.accelerator.common.util.CarbonUtils;
-import com.wso2.openbanking.accelerator.consent.extensions.ciba.authenticator.CIBAPushAuthenticatorConstants;
 import com.wso2.openbanking.accelerator.consent.extensions.internal.ConsentExtensionsDataHolder;
 import com.wso2.openbanking.accelerator.consent.mgt.dao.models.AuthorizationResource;
 import com.wso2.openbanking.accelerator.consent.mgt.service.ConsentCoreService;
@@ -40,6 +39,7 @@ public class CIBAWebLinkAuthenticatorExtensionImpl implements CIBAWebLinkAuthent
     private static final Log log = LogFactory.getLog(CIBAWebLinkAuthenticatorExtensionImpl.class);
     private static final ConsentCoreService consentCoreService =
             ConsentExtensionsDataHolder.getInstance().getConsentCoreService();
+    public static final String LOGIN_HINT = "login_hint";
 
     /**
      * Method to identify the user/users involved in the authentication.
@@ -50,7 +50,7 @@ public class CIBAWebLinkAuthenticatorExtensionImpl implements CIBAWebLinkAuthent
     @Override
     public List<AuthenticatedUser> getAuthenticatedUsers(HttpServletRequest request) {
 
-        return Arrays.stream(request.getParameter(CIBAPushAuthenticatorConstants.LOGIN_HINT)
+        return Arrays.stream(request.getParameter(LOGIN_HINT)
                         .split(","))
                 .map(String::trim)
                 .map(AuthenticatedUser::createLocalAuthenticatedUserFromSubjectIdentifier)

diff --git a/...nking/accelerator/consent/extensions/ciba/impl/CIBAAuthenticationEndpointDefaultImpl.java b/...nking/accelerator/consent/extensions/ciba/impl/CIBAAuthenticationEndpointDefaultImpl.java
diff --git a/...ng/accelerator/consent/extensions/ciba/model/CIBAAuthenticationEndpointErrorResponse.java b/...ng/accelerator/consent/extensions/ciba/model/CIBAAuthenticationEndpointErrorResponse.java
diff --git a/...anking/accelerator/consent/extensions/ciba/model/CIBAAuthenticationEndpointInterface.java b/...anking/accelerator/consent/extensions/ciba/model/CIBAAuthenticationEndpointInterface.java
diff --git a/.../wso2/openbanking/accelerator/consent/extensions/internal/ConsentExtensionsComponent.java b/.../wso2/openbanking/accelerator/consent/extensions/internal/ConsentExtensionsComponent.java
@@ -19,7 +19,6 @@
 package com.wso2.openbanking.accelerator.consent.extensions.internal;
 
 import com.wso2.openbanking.accelerator.common.config.OpenBankingConfigurationService;
-import com.wso2.openbanking.accelerator.consent.extensions.ciba.authenticator.CIBAPushAuthenticator;
 import com.wso2.openbanking.accelerator.consent.extensions.ciba.authenticator.weblink.CIBAWebLinkAuthenticator;
 import com.wso2.openbanking.accelerator.consent.extensions.ciba.authenticator.weblink.notification.CIBAWebLinkNotificationHandler;
 import com.wso2.openbanking.accelerator.consent.extensions.common.ConsentExtensionExporter;
@@ -60,10 +59,7 @@ protected void activate(ComponentContext context) {
         if (log.isDebugEnabled()) {
             log.debug("Periodical Consent Status Updater Started");
         }
-        CIBAPushAuthenticator authenticator = new CIBAPushAuthenticator();
         CIBAWebLinkAuthenticator cibaWebLinkAuthenticator = new CIBAWebLinkAuthenticator();
-        context.getBundleContext().registerService(ApplicationAuthenticator.class.getName(),
-                authenticator, null);
         context.getBundleContext().registerService(ApplicationAuthenticator.class.getName(),
                 cibaWebLinkAuthenticator, null);
         context.getBundleContext().registerService(AbstractEventHandler.class.getName(),
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,7 +28,6 @@ @@
     /**
      * CIBA Signature Algorithm Enforcer class
      */
-    @Deprecated
     public class OBCIBASignatureAlgorithmEnforcementValidator extends SignatureAlgorithmEnforcementValidator {
         /**
@@ Expand Down @@