Skip to content

7.5 update #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TylerGelinas wants to merge 1 commit into
base: master
Choose a base branch
from
Open

7.5 update #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<artifactId>client-script-auth-tree-node</artifactId>
<groupId>org.forgerock.am</groupId>
<version>1.0.1</version>
<version>1.0.3</version>
<name>ClientScript Authentication Node</name>
<description>An Authentication Tree Node for ForgeRock's Identity Platform</description>

<properties>
<am.version>6.5.0</am.version>
<am.version>7.5.0</am.version>
</properties>

<dependencyManagement>
Expand Down
13 changes: 3 additions & 10 deletions src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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";

/**
Expand All @@ -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();
Expand All @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/forgerock/openam/auth/nodes/ClientScriptNodePlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public ClientScriptNodePlugin(AnnotatedServiceRegistry serviceRegistry) {

@Override
public String getPluginVersion() {
return "1.0.1";
return "1.0.3";
}

@Override
Expand Down