Fix following bugs:

* Fix serializing not working for array objects * Fix callback function not working * Fix interpreter warning being displayed
wso2 · Jan 5, 2024 · ffab507 · ffab507
1 parent f16e12b
commit ffab507
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/...tion/authentication/framework/config/model/graph/graaljs/GraalSerializableJsFunction.java b/...tion/authentication/framework/config/model/graph/graaljs/GraalSerializableJsFunction.java
@@ -67,7 +67,7 @@ public void setSource(String source) {
     @Override
     public boolean isFunction() {
 
-        return isHostFunction;
+        return isPolyglotFunction;
     }
 
     @Override

diff --git a/...tity/application/authentication/framework/config/model/graph/graaljs/GraalSerializer.java b/...tity/application/authentication/framework/config/model/graph/graaljs/GraalSerializer.java
@@ -74,20 +74,21 @@ public static Object toJsSerializableInternal(Object value) {
                 return valueObj.asDate();
             } else if (valueObj.isBoolean()) {
                 return valueObj.asBoolean();
+            } else if (valueObj.isDuration()) {
+                return valueObj.asDuration();
+            } else if (valueObj.isTime()) {
+                return valueObj.asTime();
+            } else if (valueObj.isTimeZone()) {
+                return valueObj.asTimeZone();
+            } else if (valueObj.isNull()) {
+                return null;
             } else if (valueObj.hasArrayElements()) {
                 int arraySize = (int) valueObj.getArraySize();
                 List<Serializable> arrayItems = new ArrayList<>(arraySize);
                 for (int key = 0; key < arraySize; key++) {
-                    Object serializedObj = (valueObj.getArrayElement(key));
-                    if (serializedObj instanceof Serializable) {
-                        arrayItems.add((Serializable) serializedObj);
-                        if (log.isDebugEnabled()) {
-                            log.debug("Serialized the value of array item as : " + serializedObj);
-                        }
-                    } else {
-                        log.warn(String.format("Non serializable array item: %s. and will not be persisted.",
-                                serializedObj));
-                    }
+                    Object arrayObj = valueObj.getArrayElement(key);
+                    Object serializedObj = toJsSerializableInternal(arrayObj);
+                    arrayItems.add((Serializable) serializedObj);
                 }
                 return arrayItems;
             } else if (valueObj.hasMembers()) {
@@ -105,20 +106,11 @@ public static Object toJsSerializableInternal(Object value) {
                     }
                 });
                 return serializedMap;
-            } else if (valueObj.isDuration()) {
-                return valueObj.asDuration();
-            } else if (valueObj.isTime()) {
-                return valueObj.asTime();
-            } else if (valueObj.isTimeZone()) {
-                return valueObj.asTimeZone();
-            } else if (valueObj.isNull()) {
-                return null;
             } else {
                 return Collections.EMPTY_MAP;
             }
         }
         return value;
-
     }
 
     @Override

diff --git a/...ation/authentication/framework/config/model/graph/graaljs/JsGraalGraphBuilderFactory.java b/...ation/authentication/framework/config/model/graph/graaljs/JsGraalGraphBuilderFactory.java
@@ -77,6 +77,7 @@ public Context createEngine(AuthenticationContext authenticationContext) {
 
         Context context =
                 Context.newBuilder(FrameworkConstants.JSAttributes.POLYGLOT_LANGUAGE).allowHostAccess(HostAccess.ALL)
+                        .option("engine.WarnInterpreterOnly", "false")
                         .build();
 
         Value bindings = context.getBindings(FrameworkConstants.JSAttributes.POLYGLOT_LANGUAGE);