Merge branch 'wso2:master' into new-adapter-service

wso2 · Jan 26, 2025 · 86b4aae · 86b4aae
2 parents 98a9317 + 9ab6646
commit 86b4aae
Show file tree

Hide file tree

Showing 287 changed files with 4,765 additions and 872 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.141-SNAPSHOT</version>
+        <version>7.7.149-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...g/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactory.java b/...g/wso2/carbon/identity/action/execution/impl/ActionExecutionResponseProcessorFactory.java
@@ -39,6 +39,8 @@ public static ActionExecutionResponseProcessor getActionExecutionResponseProcess
         switch (actionType) {
             case PRE_ISSUE_ACCESS_TOKEN:
                 return actionInvocationResponseProcessors.get(ActionType.PRE_ISSUE_ACCESS_TOKEN);
+            case PRE_UPDATE_PASSWORD:
+                return actionInvocationResponseProcessors.get(ActionType.PRE_UPDATE_PASSWORD);
             case AUTHENTICATION:
                 return actionInvocationResponseProcessors.get(ActionType.AUTHENTICATION);
             default:

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
@@ -122,6 +122,7 @@ public ActionExecutionStatus<?> execute(ActionType actionType, Map<String, Objec
             validateActions(actions, actionType);
             // As of now only one action is allowed.
             Action action = actions.get(0);
+            eventContext.put("action", action);
             return execute(action, eventContext, tenantDomain);
         } catch (ActionExecutionRuntimeException e) {
             LOG.debug("Skip executing actions for action type: " + actionType.name(), e);
@@ -149,6 +150,7 @@ public ActionExecutionStatus<?> execute(ActionType actionType, String actionId,
         }
 
         Action action = getActionByActionId(actionType, actionId, tenantDomain);
+        eventContext.put("action", action);
         try {
             return execute(action, eventContext, tenantDomain);
         } catch (ActionExecutionRuntimeException e) {

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
@@ -26,6 +26,7 @@
  */
 public enum ActionType {
     PRE_ISSUE_ACCESS_TOKEN,
+    PRE_UPDATE_PASSWORD,
     AUTHENTICATION;
 
     public String getDisplayName() {

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
@@ -166,7 +166,7 @@ public void testActionExecuteSuccessWhenNoActionsAvailableForActionType() throws
     public void testActionExecuteSuccessWhenNoActiveActionAvailableForActionType() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = mock(Action.class);
         when(action.getStatus()).thenReturn(Action.Status.INACTIVE);
@@ -200,7 +200,7 @@ public void testActionExecuteSuccessWhenRuleConfiguredAndNotSatisfied() throws E
         when(ruleEvaluationService.evaluate(any(), any(), any())).thenReturn(new RuleEvaluationResult("ruleId", false));
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         ActionExecutionStatus<?> status = actionExecutorService.execute(actionType, eventContext, "tenantDomain");
 
@@ -231,10 +231,10 @@ public void testActionExecuteWithActionIdsFailureWheNullActionId() throws Except
     public void testActionExecuteFailureWhenNoRegisteredRequestBuilderForActionType() throws Exception {
 
         Action action = createAction();
-        when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
+        when(actionManagementService.getActionsByActionType(any(), eq("tenantDomain"))).thenReturn(
                 Collections.singletonList(action));
 
-        actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, any(), any());
+        actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, new HashMap<>(), "tenantDomain");
     }
 
     @Test(expectedExceptions = ActionExecutionException.class,
@@ -272,7 +272,7 @@ public void testActionExecuteFailureWhenRuleEvaluationFails() throws Exception {
         when(ruleEvaluationService.evaluate(any(), any(), any())).thenThrow(new RuleEvaluationException("Error"));
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         ActionExecutionStatus<?> status = actionExecutorService.execute(actionType, eventContext, "tenantDomain");
 
@@ -298,8 +298,7 @@ public void testActionExecuteFailureWhenBuildingActionExecutionRequestForActionI
         when(actionExecutionRequestBuilder.buildActionExecutionRequest(any())).thenThrow(
                 new ActionExecutionRequestBuilderException("Error while executing request builder."));
 
-        actionExecutorService.execute(actionType, "actionId", Collections.emptyMap(),
-                "tenantDomain");
+        actionExecutorService.execute(actionType, "actionId", new HashMap<>(), "tenantDomain");
     }
 
     @Test(expectedExceptions = ActionExecutionException.class)
@@ -318,11 +317,11 @@ public void testActionExecuteFailureAtExceptionFromRequestBuilderForActionType()
         when(actionManagementService.getActionByActionId(any(), any(), any())).thenReturn(action);
 
         ActionExecutionStatus actionExecutionStatus =
-                actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, any(), any());
+                actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, new HashMap<>(), "tenantDomain");
         assertEquals(actionExecutionStatus.getStatus(), ActionExecutionStatus.Status.FAILED);
 
         ActionExecutionStatus actionExecutionStatusWithActionIds = actionExecutorService.execute(
-                ActionType.PRE_ISSUE_ACCESS_TOKEN, any(), any(), any());
+                ActionType.PRE_ISSUE_ACCESS_TOKEN, any(), new HashMap<>(), "tenantDomain");
         assertEquals(actionExecutionStatusWithActionIds.getStatus(), ActionExecutionStatus.Status.FAILED);
     }
 
@@ -342,7 +341,7 @@ public void testActionExecuteFailureWhenNoRegisteredResponseProcessorForActionTy
                         () -> ActionExecutionRequestBuilderFactory.getActionExecutionRequestBuilder(any()))
                 .thenReturn(actionExecutionRequestBuilder);
 
-        actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, any(), any());
+        actionExecutorService.execute(ActionType.PRE_ISSUE_ACCESS_TOKEN, new HashMap<>(), "tenantDomain");
     }
 
     @Test(expectedExceptions = ActionExecutionException.class,
@@ -369,7 +368,7 @@ public void testBuildActionExecutionRequestWithExcludedHeaders()
             throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
@@ -404,7 +403,7 @@ public void testBuildActionExecutionRequestWithExcludedHeaders()
     public void testBuildActionExecutionRequest() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
@@ -436,7 +435,7 @@ public void testBuildActionExecutionRequest() throws Exception {
     public void testActionExecuteSuccessWhenNoRuleConfiguredInAction() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
@@ -479,7 +478,7 @@ public void testActionExecuteSuccessWhenNoRuleConfiguredInAction() throws Except
     public void testActionExecuteSuccessWhenRuleConfiguredInActionIsSatisfied() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(action.getActionRule()).thenReturn(ActionRule.create("ruleId", "tenantDomain"));
@@ -526,7 +525,7 @@ public void testActionExecuteSuccessWhenRuleConfiguredInActionIsSatisfied() thro
     public void testActionExecuteFailure() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
@@ -567,7 +566,7 @@ public void testActionExecuteFailure() throws Exception {
     public void testExecuteIncomplete() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
@@ -607,7 +606,7 @@ public void testExecuteIncomplete() throws Exception {
     public void testActionExecuteFailureForUnexpectedAPIResponse() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
         when(actionManagementService.getActionsByActionType(any(), any())).thenReturn(
@@ -635,7 +634,7 @@ public void testActionExecuteFailureForUnexpectedAPIResponse() throws Exception
     public void testExecuteError() throws Exception {
 
         ActionType actionType = ActionType.PRE_ISSUE_ACCESS_TOKEN;
-        Map<String, Object> eventContext = Collections.emptyMap();
+        Map<String, Object> eventContext = new HashMap<>();
 
         Action action = createAction();
 

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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

diff --git a/components/ai-services-mgt/org.wso2.carbon.identity.ai.service.mgt/pom.xml b/components/ai-services-mgt/org.wso2.carbon.identity.ai.service.mgt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>ai-services-mgt</artifactId>
-        <version>7.7.141-SNAPSHOT</version>
+        <version>7.7.149-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/components/ai-services-mgt/pom.xml b/components/ai-services-mgt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.identity.framework</groupId>
         <artifactId>identity-framework</artifactId>
-        <version>7.7.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-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.141-SNAPSHOT</version>
+        <version>7.7.149-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/...cation/authentication/framework/handler/provisioning/impl/DefaultProvisioningHandler.java b/...cation/authentication/framework/handler/provisioning/impl/DefaultProvisioningHandler.java
@@ -76,6 +76,7 @@
 import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.InternalRoleDomains.WORKFLOW_DOMAIN;
 import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.PROVISIONED_SOURCE_ID_CLAIM;
 import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.USERNAME_CLAIM;
+import static org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants.USER_ID_CLAIM;
 import static org.wso2.carbon.identity.role.v2.mgt.core.RoleConstants.ORGANIZATION;
 
 /**
@@ -275,6 +276,7 @@ private void handleUserProvisioning(String username, UserStoreManager userStoreM
 
                 userClaims.remove(FrameworkConstants.PASSWORD);
                 userClaims.remove(USERNAME_CLAIM);
+                userClaims.remove(USER_ID_CLAIM);
                 userStoreManager.setUserClaimValues(UserCoreUtil.removeDomainFromName(username), userClaims, null);
                     /*
                     Since the user is exist following code is get all active claims of user and crosschecking against