Fix authentication flow with custom authentication extension.

wso2 · Feb 2, 2025 · 5a798ee · 5a798ee
1 parent b78d6ad
commit 5a798ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/...so2/carbon/identity/application/common/model/UserDefinedFederatedAuthenticatorConfig.java b/...so2/carbon/identity/application/common/model/UserDefinedFederatedAuthenticatorConfig.java
@@ -27,7 +27,7 @@
  */
 public class UserDefinedFederatedAuthenticatorConfig extends FederatedAuthenticatorConfig {
 
-    private UserDefinedAuthenticatorEndpointConfig endpointConfig;
+    private transient UserDefinedAuthenticatorEndpointConfig endpointConfig;
 
     public UserDefinedFederatedAuthenticatorConfig() {
 

diff --git a/...entity/application/authentication/framework/config/loader/UIBasedConfigurationLoader.java b/...entity/application/authentication/framework/config/loader/UIBasedConfigurationLoader.java
@@ -51,6 +51,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.BASIC_AUTH_MECHANISM;
+
 /**
  * Sequence Configuration loader, loads the sequence configuration from the database.
  * <p>
@@ -317,7 +319,11 @@ private void loadStepAuthenticator(StepConfig stepConfig, IdentityProvider idp,
                 throw new FrameworkException("No authenticator found by the name: " + authenticatorName);
             }
             authenticatorConfig.setApplicationAuthenticator(appAuthenticatorForConfig);
-            stepConfig.getAuthenticatorList().add(authenticatorConfig);
+            if (BASIC_AUTH_MECHANISM.equals(authenticatorConfig.getApplicationAuthenticator().getAuthMechanism())) {
+                stepConfig.getAuthenticatorList().add(0, authenticatorConfig);
+            } else {
+                stepConfig.getAuthenticatorList().add(authenticatorConfig);
+            }
         }
 
         if (idp != null) {