Merge branch 'wso2:master' into add-cutsom-fed-auth-mgt-support

Thisara-Welmilla · Nov 28, 2024 · 601fde8 · 601fde8
2 parents a57931a + 8c6b1d7
commit 601fde8
Show file tree

Hide file tree

Showing 226 changed files with 238 additions and 246 deletions.
diff --git a/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.execution/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>action-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...c/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImpl.java b/...c/main/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImpl.java
@@ -117,10 +117,8 @@ public ActionExecutionStatus<?> execute(ActionType actionType, Map<String, Objec
             DIAGNOSTIC_LOGGER.logActionInitiation(action);
             return execute(action, eventContext);
         } catch (ActionExecutionRuntimeException e) {
-            DIAGNOSTIC_LOGGER.logSkippedActionExecution(actionType);
             LOG.debug("Skip executing actions for action type: " + actionType.name(), e);
-            // Skip executing actions when no action available or due to a failure in retrieving actions,
-            // is considered as action execution being successful.
+            // Skip executing actions when no action available is considered as action execution being successful.
             return new SuccessStatus.Builder().setResponseContext(eventContext).build();
         }
     }
@@ -144,10 +142,8 @@ public ActionExecutionStatus<?> execute(ActionType actionType, String[] actionId
         try {
             return execute(action, eventContext);
         } catch (ActionExecutionRuntimeException e) {
-            DIAGNOSTIC_LOGGER.logSkippedActionExecution(actionType);
             LOG.debug("Skip executing actions for action type: " + actionType.name(), e);
-            // Skip executing actions when no action available or due to a failure in retrieving actions,
-            // is considered as action execution being successful.
+            // Skip executing actions when no action available is considered as action execution being successful.
             return new SuccessStatus.Builder().setResponseContext(eventContext).build();
         }
     }
@@ -191,13 +187,13 @@ private Action getActionByActionId(ActionType actionType, String actionId, Strin
     }
 
     private List<Action> getActionsByActionType(ActionType actionType, String tenantDomain) throws
-            ActionExecutionRuntimeException {
+            ActionExecutionException {
 
         try {
             return ActionExecutionServiceComponentHolder.getInstance().getActionManagementService()
                     .getActionsByActionType(Action.ActionTypes.valueOf(actionType.name()).getPathParam(), tenantDomain);
         } catch (ActionMgtException e) {
-            throw new ActionExecutionRuntimeException("Error occurred while retrieving actions.", e);
+            throw new ActionExecutionException("Error occurred while retrieving actions.", e);
         }
     }
 

diff --git a/.../java/org/wso2/carbon/identity/action/execution/util/ActionExecutionDiagnosticLogger.java b/.../java/org/wso2/carbon/identity/action/execution/util/ActionExecutionDiagnosticLogger.java
@@ -21,7 +21,6 @@
 import org.apache.http.client.methods.HttpPost;
 import org.wso2.carbon.identity.action.execution.ActionExecutionLogConstants;
 import org.wso2.carbon.identity.action.execution.model.ActionInvocationResponse;
-import org.wso2.carbon.identity.action.execution.model.ActionType;
 import org.wso2.carbon.identity.action.management.model.Action;
 import org.wso2.carbon.identity.central.log.mgt.utils.LoggerUtils;
 import org.wso2.carbon.utils.DiagnosticLog;
@@ -47,19 +46,6 @@ public void logActionInitiation(Action action) {
                         DiagnosticLog.ResultStatus.SUCCESS));
     }
 
-    public void logSkippedActionExecution(ActionType actionType) {
-
-        if (!LoggerUtils.isDiagnosticLogsEnabled()) {
-            return;
-        }
-
-        triggerLogEvent(
-                initializeDiagnosticLogBuilder(
-                        ActionExecutionLogConstants.ActionIDs.EXECUTE_ACTION,
-                        "Skip executing action for " + actionType + " type.",
-                        DiagnosticLog.ResultStatus.FAILED));
-    }
-
     public void logActionRequest(Action action) {
 
         if (!LoggerUtils.isDiagnosticLogsEnabled()) {

diff --git a/...st/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImplTest.java b/...st/java/org/wso2/carbon/identity/action/execution/impl/ActionExecutorServiceImplTest.java
@@ -230,6 +230,16 @@ public void testActionExecuteWithActionIdFailureWhenInvalidActionIdGiven() throw
         actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, new String[]{any()}, any(), any());
     }
 
+    @Test(expectedExceptions = ActionExecutionException.class,
+            expectedExceptionsMessageRegExp = "Error occurred while retrieving actions.")
+    public void testActionExecuteWithActionFailureWhenInvalidActionGiven() throws Exception {
+
+        when(actionManagementService.getActionsByActionType(any(), any())).thenThrow(
+                new ActionMgtException("Error occurred while retrieving actions."));
+
+        actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, any(), any());
+    }
+
     @Test(expectedExceptions = ActionExecutionException.class,
             expectedExceptionsMessageRegExp = "Failed to build the request payload for action type: " +
                     "PRE_ISSUE_ACCESS_TOKEN")

diff --git a/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml b/components/action-mgt/org.wso2.carbon.identity.action.management/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>action-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/action-mgt/pom.xml b/components/action-mgt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.collection.mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>api-resource-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml b/components/api-resource-mgt/org.wso2.carbon.identity.api.resource.mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>api-resource-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>org.wso2.carbon.identity.api.resource.mgt</artifactId>

diff --git a/components/api-resource-mgt/pom.xml b/components/api-resource-mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt.ui/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml b/components/application-mgt/org.wso2.carbon.identity.application.mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>org.wso2.carbon.identity.application.mgt</artifactId>

diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...ation-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml b/...ation-framework/org.wso2.carbon.identity.application.authentication.endpoint.util/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>authentication-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...ntication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml b/...ntication-framework/org.wso2.carbon.identity.application.authentication.framework/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>authentication-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/authentication-framework/pom.xml b/components/authentication-framework/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml b/components/captcha-mgt/org.wso2.carbon.captcha.mgt/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>captcha-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/captcha-mgt/pom.xml b/components/captcha-mgt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/carbon-authenticators/pom.xml b/components/carbon-authenticators/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/...authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml b/...authenticators/thrift-authenticator/org.wso2.carbon.identity.authenticator.thrift/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>thrift-authenticator</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/carbon-authenticators/thrift-authenticator/pom.xml b/components/carbon-authenticators/thrift-authenticator/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>carbon-authenticators</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml b/components/central-logger/org.wso2.carbon.identity.central.log.mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>central-logger</artifactId>
         <groupId>org.wso2.carbon.identity.framework</groupId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/central-logger/pom.xml b/components/central-logger/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-framework</artifactId>
         <groupId>org.wso2.carbon.identity.framework</groupId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml b/components/certificate-mgt/org.wso2.carbon.identity.certificate.management/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/certificate-mgt/pom.xml b/components/certificate-mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt.ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>claim-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.claim.mgt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>claim-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt.ui/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>claim-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml b/components/claim-mgt/org.wso2.carbon.identity.claim.metadata.mgt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>claim-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/claim-mgt/pom.xml b/components/claim-mgt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml b/components/client-attestation-mgt/org.wso2.carbon.identity.client.attestation.mgt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>client-attestation-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/client-attestation-mgt/pom.xml b/components/client-attestation-mgt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.api.server.configuration.mgt/pom.xml
@@ -23,11 +23,11 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>configuration-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>org.wso2.carbon.identity.api.server.configuration.mgt</artifactId>
-    <version>7.7.3-SNAPSHOT</version>
+    <version>7.7.4-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>WSO2 Carbon - Configuration Management API</name>
     <description>Identity Configuration Management API</description>

diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>configuration-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml b/components/configuration-mgt/org.wso2.carbon.identity.configuration.mgt.endpoint/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>configuration-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/configuration-mgt/pom.xml b/components/configuration-mgt/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml b/components/consent-mgt/org.wso2.carbon.identity.consent.mgt/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>consent-mgt</artifactId>
-        <version>7.7.3-SNAPSHOT</version>
+        <version>7.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>