diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java index f4153f3c25a9811fe0bc6918d7168bfee916d187..ee72a9cc7bbe028635e4fcf9ae136ce6bb058666 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunnerFactory.java @@ -81,6 +81,8 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory private static final String USER_ID = "userId"; + private static final String USER_SESSION_TOKEN = "userSessionToken"; + private final String scriptPath; public PluginScriptRunnerFactory(String scriptPath) @@ -195,6 +197,7 @@ public class PluginScriptRunnerFactory implements IPluginScriptRunnerFactory evaluator.set(DATA_SOURCE_QUERY_SERVICE_VARIABLE_NAME, createDataSourceQueryService()); evaluator.set(AUTHORIZATION_SERVICE, createAuthorizationService()); evaluator.set(USER_ID, context.getUserId()); + evaluator.set(USER_SESSION_TOKEN, context.trySessionToken()); final ISessionWorkspaceProvider workspaceProvider = context.tryGetSessionWorkspaceProvider(); if (workspaceProvider != null) diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java index 8b92d6c25d4702ff5043c9899fa196af02361325..42e755081198d09977b1c10a401d4a60f7103356 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/IngestionService.java @@ -356,6 +356,7 @@ public abstract class IngestionService<T extends DataSetInformation> extends Agg protected ThreadParameters createThreadParameters() { Properties threadParameterProperties = new Properties(); + threadParameterProperties.putAll(properties); threadParameterProperties.put(ch.systemsx.cisd.etlserver.ThreadParameters.INCOMING_DIR, getMockIncomingDir().getAbsolutePath()); return new ThreadParameters(threadParameterProperties, this.getClass().getSimpleName());