Add check to determine API based auth flow

janakamarasena · Oct 17, 2023 · 85c914e · 85c914e
1 parent 80be93c
commit 85c914e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/...n/identity/application/authentication/framework/handler/step/impl/DefaultStepHandler.java b/...n/identity/application/authentication/framework/handler/step/impl/DefaultStepHandler.java
@@ -725,18 +725,8 @@ protected void doAuthentication(HttpServletRequest request, HttpServletResponse
             request.setAttribute(FrameworkConstants.RequestParams.FLOW_STATUS, status);
             /* If this is an authentication initiation and the authenticator supports API based authentication
              we need to send the auth initiation data in order to support performing API based authentication.*/
-            if (status == AuthenticatorFlowStatus.INCOMPLETE && authenticator.isAPIBasedAuthenticationSupported()) {
-                authenticator.getAuthInitiationData(context).ifPresent(authInitiationData -> {
-                    List<AuthenticatorData> authInitiationDataList =
-                            (List<AuthenticatorData>) request
-                                    .getAttribute(AuthServiceConstants.AUTH_SERVICE_AUTH_INITIATION_DATA);
-                    if (authInitiationDataList == null) {
-                        authInitiationDataList = new ArrayList<>();
-                        request.setAttribute(AuthServiceConstants.AUTH_SERVICE_AUTH_INITIATION_DATA,
-                                authInitiationDataList);
-                    }
-                    authInitiationDataList.add(authInitiationData);
-                });
+            if (status == AuthenticatorFlowStatus.INCOMPLETE) {
+                handleAPIBasedAuthenticationData(request, authenticator, context);
             }
 
             if (LOG.isDebugEnabled()) {
@@ -1449,4 +1439,27 @@ private String resolveUserResidentOrganization(AuthenticatedUser authenticatedUs
         }
         throw new FrameworkException("User resident organization could not found");
     }
+
+    private void handleAPIBasedAuthenticationData(HttpServletRequest request, ApplicationAuthenticator authenticator,
+                                                  AuthenticationContext context) {
+
+        if (isAPIBasedAuthenticationFlow(request) && authenticator.isAPIBasedAuthenticationSupported()) {
+            authenticator.getAuthInitiationData(context).ifPresent(authInitiationData -> {
+                List<AuthenticatorData> authInitiationDataList =
+                        (List<AuthenticatorData>) request
+                                .getAttribute(AuthServiceConstants.AUTH_SERVICE_AUTH_INITIATION_DATA);
+                if (authInitiationDataList == null) {
+                    authInitiationDataList = new ArrayList<>();
+                    request.setAttribute(AuthServiceConstants.AUTH_SERVICE_AUTH_INITIATION_DATA,
+                            authInitiationDataList);
+                }
+                authInitiationDataList.add(authInitiationData);
+            });
+        }
+    }
+
+    private boolean isAPIBasedAuthenticationFlow(HttpServletRequest request) {
+
+        return Boolean.TRUE.equals(request.getAttribute(FrameworkConstants.IS_API_BASED_AUTH_FLOW));
+    }
 }
diff --git a/...ty/application/authentication/framework/model/auth/service/AuthServiceRequestWrapper.java b/...ty/application/authentication/framework/model/auth/service/AuthServiceRequestWrapper.java
@@ -47,6 +47,7 @@ public AuthServiceRequestWrapper(HttpServletRequest request, Map<String, String[
         this.parameters = parameters;
         setSessionDataKey(parameters);
         skipNonceCookieValidation();
+        this.setAttribute(FrameworkConstants.IS_API_BASED_AUTH_FLOW, true);
     }
 
     @Override

diff --git a/...rg/wso2/carbon/identity/application/authentication/framework/util/FrameworkConstants.java b/...rg/wso2/carbon/identity/application/authentication/framework/util/FrameworkConstants.java
@@ -78,6 +78,7 @@ public abstract class FrameworkConstants {
     public static final String SKIP_NONCE_COOKIE_VALIDATION = "SkipNonceCookieValidation";
     public static final String IS_MULTI_OPS_RESPONSE = "isMultiOptionsResponse";
     public static final String IS_AUTH_FLOW_CONCLUDED = "isAuthFlowConcluded";
+    public static final String IS_API_BASED_AUTH_FLOW = "isAPIBasedAuthFlow";
 
     // This is to support sign-up form to be displayed in the provisioning flow, as when trying to displaying the
     // sign-up form, we validate whether self-sign up is enabled.