Fix failures due to new changes

wso2-extensions · May 19, 2024 · fa5fbbe · fa5fbbe
1 parent bcb1aa0
commit fa5fbbe
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/...n/java/org/wso2/carbon/identity/conditional/auth/functions/http/AbstractHTTPFunction.java b/...n/java/org/wso2/carbon/identity/conditional/auth/functions/http/AbstractHTTPFunction.java
@@ -46,6 +46,7 @@
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -94,15 +95,19 @@ public boolean shouldRetry() {
     protected void executeHttpMethod(HttpUriRequest clientRequest, Map<String, Object> eventHandlers,
                                      AuthConfigModel authConfigModel) {
 
+        Map<String, Object> eventHandlersMap = new HashMap<>(eventHandlers);
+        AuthConfigModel authConfigModelClone =
+                authConfigModel == null ? null : new AuthConfigModel(authConfigModel.getType(),
+                        new HashMap<>(authConfigModel.getProperties()));
         AsyncProcess asyncProcess = new AsyncProcess((context, asyncReturn) -> {
             String outcome;
             String endpointURL = null;
 
             HttpUriRequest request;
             try {
-                if (authConfigModel != null) {
-                    AuthConfig authConfig = AuthConfigFactory.getAuthConfig(authConfigModel, context, asyncReturn);
-                    request = authConfig.applyAuth(clientRequest, authConfigModel);
+                if (authConfigModelClone != null) {
+                    AuthConfig authConfig = AuthConfigFactory.getAuthConfig(authConfigModelClone, context, asyncReturn);
+                    request = authConfig.applyAuth(clientRequest, authConfigModelClone);
                 } else {
                     request = clientRequest;
                 }
@@ -130,7 +135,7 @@ protected void executeHttpMethod(HttpUriRequest clientRequest, Map<String, Objec
                 asyncReturn.accept(context, Collections.emptyMap(), Constants.OUTCOME_FAIL);
             }
         });
-        JsGraphBuilder.addLongWaitProcess(asyncProcess, eventHandlers);
+        JsGraphBuilder.addLongWaitProcess(asyncProcess, eventHandlersMap);
     }
 
     /**

diff --git a/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml b/components/org.wso2.carbon.identity.conditional.auth.functions.user/pom.xml
@@ -169,8 +169,6 @@
                             version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js;
                             version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js.nashorn;
-                            version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js.openjdk.*;
                             version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config.model.graph.js.graaljs;
@@ -179,8 +177,6 @@
                             version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config.model.graph.graaljs;
                             version="${carbon.identity.package.import.version.range}",
-                            org.wso2.carbon.identity.application.authentication.framework.config.model.graph.openjdk.nashorn;
-                            version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.config.model;
                             version="${carbon.identity.package.import.version.range}",
                             org.wso2.carbon.identity.application.authentication.framework.context;

diff --git a/pom.xml b/pom.xml
@@ -494,7 +494,7 @@
         <carbon.kernel.version>4.9.17</carbon.kernel.version>
         <carbon.kernel.package.import.version.range>[4.6.0, 5.0.0)</carbon.kernel.package.import.version.range>
         <carbon.user.package.import.version.range>[1.0.1, 2.0.0)</carbon.user.package.import.version.range>
-        <carbon.identity.framework.version>7.0.74-SNAPSHOT</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.2.26-SNAPSHOT</carbon.identity.framework.version>
         <identity.organization.management.core.version>1.0.89</identity.organization.management.core.version>
         <carbon.identity.framework.testutils.version>5.20.447</carbon.identity.framework.testutils.version>
         <carbon.identity.package.import.version.range>[5.14.0, 8.0.0)</carbon.identity.package.import.version.range>