@adobe/acc-js-sdk 1.1.45 → 1.1.47

package/docs/changeLog.html

@@ -2,6 +2,25 @@
 layout: page
 title: Change Log
 ---
+<section class="changelog"><h1>Version 1.1.47</h1>
+  <h2>2024/04/23</h2>
+  <li>
+    Issue 105 (https://github.com/adobe/acc-js-sdk/issues/105). Fix XML name of parameters in workflow functions. The name is expected to be 'variables' and not 'parameters'.
+    Methods StartWithParameters, PostEvent, SimulateWithParameters, SpawnWithParameters, and SpawnWithParametersEx are included.
+  </li>
+</section>
+
+
+<section class="changelog"><h1>Version 1.1.46</h1>
+  <h2>2024/03/19</h2>
+  <li>
+    Method nms:extAccount#TestAccount could not be called because it has parameters which are both input and output (inout="inout") and this was not supported by the SDK
+  </li>
+  <li>
+    Update follow-redirects 3rd party to fix a potential vulnerability
+  </li>
+</section>
+
 <section class="changelog"><h1>Version 1.1.45</h1>
   <h2>2024/01/15</h2>
   <li>

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.45",
+      "version": "1.1.47",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.2.1",
@@ -2219,9 +2219,9 @@
       "license": "ISC"
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
       "funding": [
         {
           "type": "individual",
@@ -6186,9 +6186,9 @@
       "dev": true
     },
     "follow-redirects": {
-      "version": "1.15.5",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
-      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw=="
+      "version": "1.15.6",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
+      "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA=="
     },
     "form-data": {
       "version": "4.0.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.45",
+  "version": "1.1.47",
   "description": "ACC Javascript SDK",
   "main": "src/index.js",
   "homepage": "https://github.com/adobe/acc-js-sdk#readme",

package/samples/030 - basics - workflows.js

@@ -0,0 +1,40 @@
+/*
+Copyright 2020 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+const utils = require("./utils.js");
+
+/* Basic samples illustrating how to manage workflows
+ */
+
+( async () => {
+
+  await utils.sample({
+    title: "Activate a workflow via a signal",
+    labels: [ "xtk:workflow", "Basics", "Workflow", "Signal" ],
+    description: `The PostEvent method activats a signal activity of a workflow`,
+    code: async() => {
+      return await utils.logon(async (client, NLWS) => {
+        console.log("This sample will post an event to a signal activity of a workflow.");
+    
+        const workflowIdOrName = "WKF20";
+        const activityName = "signal";
+        const transitionName = "";
+        const variables = { hello: "world" };
+        const complete = false;
+        await NLWS.xtkWorkflow.postEvent(workflowIdOrName, activityName, transitionName, variables, complete);
+
+      });
+    }
+  });
+
+  
+})();
+

package/src/client.js

@@ -1197,7 +1197,9 @@ class Client {
                     // Hack for workflow API. The C++ code checks that the name of the XML element is <variables>. When
                     // using xml representation at the SDK level, it's ok since the SDK caller will set that. But this does
                     // not work when using "BadgerFish" representation where we do not know the root element name.
-                    if (entitySchemaId == "xtk:workflow" && methodName == "StartWithParameters" && paramName == "parameters")
+                    if (entitySchemaId == "xtk:workflow" && paramName == "parameters" && (
+                        methodName == "StartWithParameters" || methodName == "PostEvent" || methodName == "SimulateWithParameters" ||
+                        methodName == "SpawnWithParameters" || methodName == "SpawnWithParametersEx") )
                         docName = "variables";
                     if (entitySchemaId == "nms:rtEvent" && methodName == "PushEvent")
                         docName = "rtEvent";
@@ -2043,7 +2045,9 @@ class Client {
                 const inout = DomUtil.getAttributeAsString(param, "inout");
                 const type = DomUtil.getAttributeAsString(param, "type");
                 const paramName = DomUtil.getAttributeAsString(param, "name");
-                if (!inout || inout=="in") {
+                const isIn = !inout || inout=="in" || inout=="inout";
+                const isOut = inout=="out" || inout=="inout";
+                if (isIn) {
                     let paramValue = parametersIsArray ? parameters[paramIndex] : parameters;
                     const inputParam = {
                         name: paramName,
@@ -2053,13 +2057,13 @@ class Client {
                     inputParams.push(inputParam);
                     paramIndex = paramIndex + 1;
                 }
-                else if (inout=="out") {
+                if (isOut) {
                     outputParams.push({
                         name: paramName,
                         type: type,
                     });
                 }
-                else {
+                if( !isIn && !isOut) {
                     throw CampaignException.BAD_PARAMETER("inout", inout, `Parameter '${paramName}' of schema '${entitySchemaId}' is not correctly defined as an input or output parameter`);
                 }
                 param = DomUtil.getNextSiblingElement(param, "param");

package/test/client.test.js

@@ -1061,26 +1061,44 @@ describe('ACC Client', function () {
             await client.NLWS.xtkSession.logon();
 
             client._transport.mockReturnValueOnce(Mock.GET_XTK_WORKFLOW_SCHEMA_RESPONSE);
-            client._transport.mockImplementationOnce(options => {
-                const doc = DomUtil.parse(options.data);
-                const body = DomUtil.findElement(doc.documentElement, "SOAP-ENV:Body");
-                const method = DomUtil.getFirstChildElement(body);
-                const parameters = DomUtil.findElement(method, "parameters");
-                const variables = DomUtil.getFirstChildElement(parameters, "variables");
-                if (!variables)
-                    throw new Error("Did not find 'variables' node");
-                if (variables.getAttribute("hello") != "world")
-                    throw new Error("Did not find 'hello' variable");
 
-                return Promise.resolve(`<?xml version='1.0'?>
-                    <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:workflow' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
-                        <SOAP-ENV:Body>
-                        <StartWithParametersResponse xmlns='urn:xtk:workflow' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
-                        </StartWithParametersResponse>
-                        </SOAP-ENV:Body>
-                    </SOAP-ENV:Envelope>`);
-            });
-            await client.NLWS.xtkWorkflow.startWithParameters(4900, { "hello": "world" });
+            const mockImpl = (methodName) => {
+                client._transport.mockImplementationOnce(options => {
+                    const doc = DomUtil.parse(options.data);
+                    const body = DomUtil.findElement(doc.documentElement, "SOAP-ENV:Body");
+                    const method = DomUtil.getFirstChildElement(body);
+                    const parameters = DomUtil.findElement(method, "parameters");
+                    const variables = DomUtil.getFirstChildElement(parameters, "variables");
+                    if (!variables)
+                        throw new Error("Did not find 'variables' node");
+                    if (variables.getAttribute("hello") != "world")
+                        throw new Error("Did not find 'hello' variable");
+
+                    const tagName = methodName + "Response";
+                    return Promise.resolve(`<?xml version='1.0'?>
+                        <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:xtk:workflow' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+                            <SOAP-ENV:Body>
+                            <${tagName} xmlns='urn:xtk:workflow' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                            </${tagName}>
+                            </SOAP-ENV:Body>
+                        </SOAP-ENV:Envelope>`);
+                });
+            };
+
+            const variables = { "hello": "world" };
+
+            mockImpl("StartWithParameters");
+            await client.NLWS.xtkWorkflow.startWithParameters(4900, variables);
+            mockImpl("SimulateWithParameters");
+            await client.NLWS.xtkWorkflow.simulateWithParameters(4900, variables);
+            mockImpl("PostEvent");
+            await client.NLWS.xtkWorkflow.postEvent("WFK123", "signal", "", variables, false);
+            
+            // return parameter instanceId has been removed from the mock method definition to simplify the unit test
+            mockImpl("SpawnWithParameters");
+            await client.NLWS.xtkWorkflow.spawnWithParameters(4900, variables);
+            mockImpl("SpawnWithParametersEx");
+            await client.NLWS.xtkWorkflow.spawnWithParametersEx(4900, true, variables);
 
             client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
             await client.NLWS.xtkSession.logoff();
@@ -4351,4 +4369,33 @@ describe('ACC Client', function () {
             expect(result[1].serverInfo.buildNumber).toBe("9219");
         });
     });
+
+    describe("Test inout parameter", () => {
+        it("Call testAccount with inout parameter", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            client._transport.mockReturnValueOnce(Mock.GET_NMS_EXTACCOUNT_SCHEMA_WITH_METHODS_RESPONSE);
+
+            client._transport.mockReturnValueOnce(Promise.resolve(`<?xml version='1.0'?>
+            <SOAP-ENV:Envelope
+                xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+                xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+                xmlns:ns='urn:nms:extAccount'
+                xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+                <SOAP-ENV:Body>
+                    <TestAccountResponse
+                        xmlns='urn:nms:extAccount' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+                        <pstrServer xsi:type='xsd:string'>localhost</pstrServer>
+                        <pstrDbmsVer xsi:type='xsd:string'>Database server version 'PostgreSQL 12.2, compiled by Visual C++ build 1914, 64-bit'.</pstrDbmsVer>
+                        <pstrWarehouse xsi:type='xsd:string'></pstrWarehouse>
+                        <pstrTestDuration xsi:type='xsd:string'>Test connection took: 0 ms</pstrTestDuration>
+                    </TestAccountResponse>
+                </SOAP-ENV:Body>
+            </SOAP-ENV:Envelope>`));
+
+            const result = await client.NLWS.nmsExtAccount.testAccount(7, true, "PostgreSQL:localhost", "postgres", "password", "NChar=0;unicodeData=1;timezone=_server_;dbSchema=public;fileMethod=uploadFile;filePath=", "pg2", 0);
+        });
+    });
 });

package/test/mock.js

@@ -567,6 +567,50 @@ const GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
 
+const GET_NMS_EXTACCOUNT_SCHEMA_WITH_METHODS_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
+<SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:wpp:default' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+<SOAP-ENV:Body>
+    <GetEntityIfMoreRecentResponse xmlns='urn:wpp:default' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+        <pdomDoc xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+            <schema name="extAccount" namespace="nms" xtkschema="xtk:schema">
+                <enumeration basetype="byte" default="delivery" name="type">
+                    <value name="bounces" value="0"/>
+                    <value name="hdfs" value="17"/>
+                </enumeration>
+                <enumeration basetype="byte" default="none" name="encryptionType">
+                    <value name="none" value="0"/>
+                    <value name="ssl" value="1"/>
+                </enumeration>
+                <element name="extAccount"></element>
+                <methods>
+                    <method name="TestAccount" static="true">
+                    <help>Performs a connection test</help>
+                    <parameters>
+                        <param name="type" type="byte" desc="Account type"/>
+                        <param name="active" type="boolean" desc="Is account active"/>
+                        <param name="server" type="string" desc="Server address" inout="inout"/>
+                        <param name="account" type="string" desc="Name (or login) of account"/>
+                        <param name="password" type="string" desc="Password associated with account"/>
+                        <param name="port" type="string" desc="Server port"/>
+                        <param name="options" type="string" desc="Connection options"/>
+                        <param name="name" type="string" desc="Account name" optional="true"/>
+                        <param name="oauth" type="boolean" desc="OAUth 2.0 activation"/>
+                        <param name="azureTenant" type="string" desc="Azure tenant" optional="true"/>
+                        <param name="clientId" type="string" desc="Azure client Id" optional="true"/>
+                        <param name="clientSecret" type="string" desc="Azure client secret" optional="true"/>
+                        <param name="redirectUrl" type="string" desc="Azure redirect url" optional="true"/>
+                        <param name="dbmsVer" type="string" desc="DBMS Version" inout="out" optional="true"/>
+                        <param name="warehouse" type="string" desc="Warehouse name" inout="out" optional="true"/>
+                        <param name="testDuration" type="string" desc="Formatted string displaying connection time in ms" inout="out" optional="true"/>
+                    </parameters>
+                    </method>
+                </methods>
+            </schema>
+        </pdomDoc>
+    </GetEntityIfMoreRecentResponse>
+</SOAP-ENV:Body>
+</SOAP-ENV:Envelope>`);
+
 const GET_XTK_IMPL_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
     <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:wpp:default' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
@@ -698,6 +742,34 @@ const GET_XTK_WORKFLOW_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
                             <param name="parameters" type="DOMElement" inout="in"></param>
                         </parameters>
                     </method>
+                    <method name="SimulateWithParameters" static="true">
+                        <parameters>
+                            <param name="workflowId" type="string" inout="in" />
+                            <param name="parameters" type="DOMElement" inout="in"></param>
+                        </parameters>
+                    </method>
+                    <method name="PostEvent" static="true">              
+                        <parameters>
+                            <param name="workflowId" type="string" inout="in"/>
+                            <param name="activity" type="string" inout="in"/>
+                            <param name="transition"     type="string"      inout="in"/>
+                            <param name="parameters"     type="DOMElement"  inout="in"/>
+                            <param name="complete"       type="boolean"     inout="in"/>
+                        </parameters>
+                    </method>
+                    <method name="SpawnWithParameters" static="true">
+                        <parameters>
+                            <param name="workflowId" type="string" inout="in" />
+                            <param name="parameters" type="DOMElement" inout="in"></param>
+                        </parameters>
+                    </method>
+                    <method name="SpawnWithParametersEx" static="true">
+                        <parameters>
+                            <param name="workflowId" type="string" inout="in" />
+                            <param name="simulation" type="boolean" inout="in"/>
+                            <param name="parameters" type="DOMElement" inout="in"></param>
+                        </parameters>
+                    </method>
                 </methods>
             </schema>
             </pdomDoc>
@@ -1061,6 +1133,7 @@ exports.Mock = {
   GET_LOGON_MID_RESPONSE: GET_LOGON_MID_RESPONSE,
   GET_TSTCNX_RESPONSE: GET_TSTCNX_RESPONSE,
   GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE: GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE,
+  GET_NMS_EXTACCOUNT_SCHEMA_WITH_METHODS_RESPONSE: GET_NMS_EXTACCOUNT_SCHEMA_WITH_METHODS_RESPONSE,
   GET_XTK_ALL_SCHEMA_RESPONSE: GET_XTK_ALL_SCHEMA_RESPONSE,
   GET_XTK_IMPL_SCHEMA_RESPONSE: GET_XTK_IMPL_SCHEMA_RESPONSE,
   GET_XTK_ALL_TYPES_RESPONSE: GET_XTK_ALL_TYPES_RESPONSE,