From 89a91f4780214189e7cc7af8cfc1b01e08014de7 Mon Sep 17 00:00:00 2001 From: TylerGelinas Date: Thu, 30 Apr 2026 15:59:34 -0500 Subject: [PATCH] 7.5 update --- pom.xml | 4 ++-- .../openam/auth/nodes/ClientScriptNode.java | 13 +++---------- .../openam/auth/nodes/ClientScriptNodePlugin.java | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 1e0e612..cd6ad4f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,12 +23,12 @@ client-script-auth-tree-node org.forgerock.am - 1.0.1 + 1.0.3 ClientScript Authentication Node An Authentication Tree Node for ForgeRock's Identity Platform - 6.5.0 + 7.5.0 diff --git a/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNode.java b/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNode.java index 6aacd0a..25fbaf6 100644 --- a/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNode.java +++ b/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNode.java @@ -25,15 +25,11 @@ import com.google.inject.assistedinject.Assisted; import com.sun.identity.authentication.callbacks.HiddenValueCallback; import com.sun.identity.authentication.callbacks.ScriptTextOutputCallback; -import com.sun.identity.shared.debug.Debug; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import org.forgerock.json.JsonValue; import org.forgerock.openam.annotations.sm.Attribute; import org.forgerock.openam.auth.node.api.*; -import org.forgerock.openam.scripting.Script; -import org.forgerock.openam.scripting.ScriptConstants; -import org.forgerock.openam.scripting.service.ScriptConfiguration; import javax.security.auth.callback.Callback; import java.util.Optional; import static org.forgerock.openam.auth.node.api.Action.send; @@ -48,8 +44,6 @@ configClass = ClientScriptNode.Config.class) public class ClientScriptNode extends SingleOutcomeNode { - private final static String DEBUG_FILE = "ClientScriptNode"; - protected Debug debug = Debug.getInstance(DEBUG_FILE); private static final String BUNDLE = "org/forgerock/openam/auth/nodes/ClientScriptNode"; /** @@ -61,8 +55,7 @@ public interface Config { * @return the amount. */ @Attribute(order = 100) - @Script(ScriptConstants.AUTHENTICATION_CLIENT_SIDE_NAME) - ScriptConfiguration script(); + String script(); @Attribute(order = 200) String scriptResult(); @@ -88,7 +81,7 @@ public Action process(TreeContext context) throws NodeProcessException { newSharedState.put(config.scriptResult(), result.get()); return goToNext().replaceSharedState(newSharedState).build(); } else { - String clientSideScriptExecutorFunction = createClientSideScriptExecutorFunction(config.script().getScript(), config.scriptResult(), + String clientSideScriptExecutorFunction = createClientSideScriptExecutorFunction(config.script(), config.scriptResult(), true, context.sharedState.toString()); ScriptTextOutputCallback scriptAndSelfSubmitCallback = new ScriptTextOutputCallback(clientSideScriptExecutorFunction); @@ -135,7 +128,7 @@ public static String createClientSideScriptExecutorFunction(String script, Strin " }\n" + " %s\n" + // script " setTimeout(submit, autoSubmitDelay);\n" + - "}) (document.forms[0].elements['%s']);\n", // outputParameterId + "})(document.getElementById('%s'));\n", // outputParameterId context, script, outputParameterId); diff --git a/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNodePlugin.java b/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNodePlugin.java index ec13044..49fa1d7 100644 --- a/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNodePlugin.java +++ b/src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNodePlugin.java @@ -51,7 +51,7 @@ public ClientScriptNodePlugin(AnnotatedServiceRegistry serviceRegistry) { @Override public String getPluginVersion() { - return "1.0.1"; + return "1.0.3"; } @Override