Provide support for authentication action type.

Thisara-Welmilla · Aug 12, 2024 · c43f87c · c43f87c
1 parent 8f81737
commit c43f87c
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 6 deletions.
diff --git a/...va/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactory.java b/...va/org/wso2/carbon/identity/action/execution/ActionExecutionResponseProcessorFactory.java
@@ -38,6 +38,8 @@ public static ActionExecutionResponseProcessor getActionExecutionResponseProcess
         switch (actionType) {
             case PRE_ISSUE_ACCESS_TOKEN:
                 return actionInvocationResponseProcessors.get(ActionType.PRE_ISSUE_ACCESS_TOKEN);
+            case AUTHENTICATION:
+                return actionInvocationResponseProcessors.get(ActionType.AUTHENTICATION);
             default:
                 return null;
         }

diff --git a/...on/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImpl.java b/...on/src/main/java/org/wso2/carbon/identity/action/execution/ActionExecutorServiceImpl.java
@@ -22,6 +22,7 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.action.execution.exception.ActionExecutionException;
@@ -82,6 +83,8 @@ public boolean isExecutionEnabled(ActionType actionType) {
         switch (actionType) {
             case PRE_ISSUE_ACCESS_TOKEN:
                 return IdentityUtil.isPreIssueAccessTokenActionTypeEnabled();
+            case AUTHENTICATION:
+                return IdentityUtil.isAuthenticationActionTypeEnabled();
             default:
                 return false;
         }
@@ -90,13 +93,26 @@ public boolean isExecutionEnabled(ActionType actionType) {
     public ActionExecutionStatus execute(ActionType actionType, Map<String, Object> eventContext, String tenantDomain)
             throws ActionExecutionException {
 
+        return execute(actionType, null, eventContext, tenantDomain);
+    }
+
+    public ActionExecutionStatus execute(ActionType actionType, String actionId, Map<String, Object> eventContext,
+                                         String tenantDomain) throws ActionExecutionException {
+
         try {
-            List<Action> actions = getActionsByActionType(actionType, tenantDomain);
-            validateActions(actions, actionType);
+            Action action;
+            if (StringUtils.isNotBlank(actionId)) {
+                List<Action> actions = getActionsByActionType(actionType, tenantDomain);
+                validateActions(actions, actionType);
+                // As of now only one action is allowed.
+                action = actions.get(0);
+            } else {
+                action = getActionsByActionId(actionId, tenantDomain);
+            }
+
             ActionExecutionRequest actionRequest = buildActionExecutionRequest(actionType, eventContext);
             ActionExecutionResponseProcessor actionExecutionResponseProcessor = getResponseProcessor(actionType);
 
-            Action action = actions.get(0); // As of now only one action is allowed.
             return Optional.ofNullable(action)
                     .filter(activeAction -> activeAction.getStatus() == Action.Status.ACTIVE)
                     .map(activeAction -> executeAction(activeAction, actionRequest, eventContext,
@@ -121,6 +137,16 @@ private List<Action> getActionsByActionType(ActionType actionType, String tenant
         }
     }
 
+    private Action getActionsByActionId(String actionId, String tenantDomain) throws ActionExecutionRuntimeException {
+
+        try {
+            return ActionExecutionServiceComponentHolder.getInstance().getActionManagementService()
+                    .getActionByActionId(actionId, tenantDomain);
+        } catch (ActionMgtException e) {
+            throw new ActionExecutionRuntimeException("Error occurred while retrieving actions.", e);
+        }
+    }
+
     private void validateActions(List<Action> actions, ActionType actionType) throws ActionExecutionException {
 
         if (CollectionUtils.isEmpty(actions)) {

diff --git a/...n.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/ActionType.java b/...n.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/ActionType.java
@@ -24,4 +24,5 @@
  */
 public enum ActionType {
     PRE_ISSUE_ACCESS_TOKEN,
+    AUTHENTICATION
 }
diff --git a/...on.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Operation.java b/...on.execution/src/main/java/org/wso2/carbon/identity/action/execution/model/Operation.java
@@ -29,7 +29,8 @@
 public enum Operation {
     ADD("add"),
     REMOVE("remove"),
-    REPLACE("replace");
+    REPLACE("replace"),
+    REDIRECT("redirect");
 
     private final String value;
 

diff --git a/...src/main/java/org/wso2/carbon/identity/action/management/ActionManagementServiceImpl.java b/...src/main/java/org/wso2/carbon/identity/action/management/ActionManagementServiceImpl.java
@@ -18,6 +18,7 @@
 
 package org.wso2.carbon.identity.action.management;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.identity.action.management.constant.ActionMgtConstants;
@@ -189,6 +190,9 @@ private String getActionTypeFromPath(String actionType) throws ActionMgtClientEx
      */
     private void validateMaxActionsPerType(String actionType, String tenantDomain) throws ActionMgtException {
 
+        if (StringUtils.equals(Action.ActionTypes.AUTHENTICATION.getActionType(), actionType)) {
+            return;
+        }
         Map<String, Integer> actionsCountPerType = getActionsCountPerType(tenantDomain);
         if (actionsCountPerType.containsKey(actionType) &&
                 actionsCountPerType.get(actionType) >= IdentityUtil.getMaximumActionsPerActionType()) {

diff --git a/...ion.management/src/main/java/org/wso2/carbon/identity/action/management/model/Action.java b/...ion.management/src/main/java/org/wso2/carbon/identity/action/management/model/Action.java
@@ -48,7 +48,12 @@ public enum ActionTypes {
                 "preRegistration",
                 "PRE_REGISTRATION",
                 "Pre Registration.",
-                "Configure an extension point for modifying user registration via a custom service.");
+                "Configure an extension point for modifying user registration via a custom service."),
+        AUTHENTICATION(
+                "authentication",
+                        "AUTHENTICATION",
+                        "Authentication.",
+                        "Configure an extension point for user authentication via a custom service."),;
 
         private final String pathParam;
         private final String actionType;

diff --git a/...identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityCoreConstants.java b/...identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityCoreConstants.java
@@ -110,7 +110,8 @@ public class IdentityCoreConstants {
     // Actions constants.
     public static final String MAXIMUM_ACTIONS_PER_TYPE_PROPERTY = "Actions.MaximumActionsPerType";
     public static final String PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE_ENABLE_PROPERTY = "Actions.Types.PreIssueAccessToken.Enable";
-
+    public static final String AUTHENTICATION_ACTION_TYPE_ENABLE_PROPERTY = "Actions.Types.PreIssueAccessToken.Enable";
+
     public static final int DEFAULT_MAXIMUM_ACTIONS_PER_TYPE = 1;
     public static final boolean DEFAULT_PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE_ENABLE_VALUE = false;
 

diff --git a/...2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityUtil.java b/...2.carbon.identity.core/src/main/java/org/wso2/carbon/identity/core/util/IdentityUtil.java
@@ -1511,6 +1511,16 @@ public static boolean isPreIssueAccessTokenActionTypeEnabled() {
             IdentityCoreConstants.DEFAULT_PRE_ISSUE_ACCESS_TOKEN_ACTION_TYPE_ENABLE_VALUE);
     }
 
+    /**
+     * Get Pre Issue Access Token Action Type enabled status.
+     *
+     * @return Whether the Pre Issue Access Token Action type is enabled or not.
+     */
+    public static boolean isAuthenticationActionTypeEnabled() {
+
+        return isActionTypeEnabled(IdentityCoreConstants.AUTHENTICATION_ACTION_TYPE_ENABLE_PROPERTY, false);
+    }
+
     /**
      * Check whether a given action type is enabled or not.
      *