@adobe/acc-js-sdk 1.1.47 → 1.1.49

package/docs/_data/navigation.yml

@@ -66,6 +66,8 @@
       link: reportData.html
     - name: AEM asset upload API
       link: uploadAemAsset.html
+    - name: Downloading files
+      link: download.html
 - name: --
 - name: Advanced Topics
   children:

package/docs/changeLog.html

@@ -2,10 +2,35 @@
 layout: page
 title: Change Log
 ---
+<section class="changelog"><h1>Version 1.1.49</h1>
+  <h2>2024/07/97</h2>
+  <li>
+    <a href="https://github.com/adobe/acc-js-sdk/pull/109">Issue 109</a>. Extra HTTP headers were not passed in all API calls.
+  </li>
+  <li>
+    Updated dependencies to fix vulnerabilities.
+  </li>
+</section>
+
+
+<section class="changelog"><h1>Version 1.1.48</h1>
+  <h2>2024/06/11</h2>
+  <li>
+    <a href="https://github.com/adobe/acc-js-sdk/issues/106">Issue 106</a>. Add support for file download.
+  </li>
+  <li>
+    <a href="https://github.com/adobe/acc-js-sdk/issues/10"7>Issue 107</a>. Ability to create a job interface from a job id and get the job status from here.
+  </li>
+  <li>
+    Updated dependencies to fix <a href="https://github.com/advisories/GHSA-grv7-fg5c-xmjg">vulnerabilities</a>.
+  </li>
+</section>
+
+
 <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'.
+    <a href="https://github.com/adobe/acc-js-sdk/issues/105">Issue 105</a>. 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>

package/docs/download.html

@@ -0,0 +1,25 @@
+---
+layout: page
+title: Downloading files
+---
+
+<p>
+    Files can be downloaded using the <b>client.fileUploader.download</b> method. In order to download a file from the Campaign server, you need the file md5 and extension which act as the file key. For example, the md5 of a file attachment in a delivry is available in the attachment/@md5 attribute.
+</p>
+
+<p>
+    In the following example, a CSV file is downloaded
+</p>
+
+<pre class="code">
+    const responseFile = await client.fileUploader.download("d83d8b9a7504043644e1f2dd0a28bf7f", "csv", {
+        fileName: 'My Sample File.csv',
+        contentType: "txt/csv",
+    });
+</pre>
+
+<p>
+    The function returns a <a href="https://w3c.github.io/FileAPI/#file-section">File Blob</a>
+<p>
+
+<p class="warning">This function only works when using the SDK in the browser.</p>

package/docs/xtkJob.html

@@ -106,6 +106,15 @@ title: XTK Jobs (xkt:job, xkt:jobInterface)
   </tbody>
 </table>
 
+<p>
+  You can get the status of a job, given a job id as follow
+</p>
+
+<pre class="code">
+  const jobId = 'ABC';
+  const job = new XtkJobInterface(client, { jobId });
+  const status = await job.getStatus(12, 500);
+</pre>
 
 <h1>Job Progress</h1>
 <p>

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.47",
+  "version": "1.1.49",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.47",
+      "version": "1.1.49",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.2.1",
@@ -1437,11 +1437,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -2179,9 +2180,10 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -2557,8 +2559,9 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
@@ -4321,8 +4324,9 @@
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -4583,14 +4587,15 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.11.0",
-      "license": "MIT",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -5687,10 +5692,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browserslist": {
@@ -6159,7 +6166,9 @@
       }
     },
     "fill-range": {
-      "version": "7.0.1",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
@@ -6385,6 +6394,8 @@
     },
     "is-number": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "dev": true
     },
     "is-potential-custom-element-name": {
@@ -7543,6 +7554,8 @@
     },
     "to-regex-range": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "dev": true,
       "requires": {
         "is-number": "^7.0.0"
@@ -7704,7 +7717,9 @@
       }
     },
     "ws": {
-      "version": "8.11.0",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "requires": {}
     },
     "xml": {

package/package.json

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

package/src/campaign.js

@@ -43,7 +43,7 @@ const { Util } = require("./util.js");
   static FEATURE_NOT_SUPPORTED(name)                      { return new CampaignException(undefined, 500, 16384, `SDK-000015 ${name} feature is not supported by the ACC instance`); }
   static REQUEST_ABORTED( )                               { return new CampaignException(undefined, 500,   -53, `SDK-000016 Request was aborted by the client`); }
   static AEM_ASSET_UPLOAD_FAILED(details, statusCode=500) { return new CampaignException(undefined, statusCode, 16384, `SDK-000017 Failed to upload AEM asset`, details); }
-
+  static FILE_DOWNLOAD_FAILED(name, details)              { return new CampaignException(undefined, 500, 16384, `SDK-000018 "Failed to download file ${name}`, details); }
 
   /**
    * Returns a short description of the exception
@@ -67,7 +67,6 @@ const { Util } = require("./util.js");
    * @param {Error|string} cause an optional error object representing the cause of the exception
    */
   constructor(call, statusCode, faultCode, faultString, detail, cause) {
-
       // Provides a shorter and more friendly description of the call and method name
       // depending on whether the exception is thrown by a SOAP or HTTP call
       var methodCall;

package/src/client.js

@@ -595,6 +595,8 @@ const fileUploader = (client) => {
                     const data = new FormData();
                     data.append('file_noMd5', file);
                     const headers = client._getAuthHeaders(false);
+                    for (let h in client._connectionParameters._options.extraHttpHeaders)
+                        headers[h] = client._connectionParameters._options.extraHttpHeaders[h];
                     client._makeHttpCall({
                         url: `${client._connectionParameters._endpoint}/nl/jsp/uploadFile.jsp`,
                         processData: false,
@@ -680,7 +682,8 @@ const fileUploader = (client) => {
                 const jsonData = JSON.stringify({
                     'assetDownloadUrl': assetDownloadUrl
                 });
-
+                for (let h in client._connectionParameters._options.extraHttpHeaders)
+                    headers[h] = client._connectionParameters._options.extraHttpHeaders[h];
                 var response = await client._makeHttpCall({
                     url: url,
                     method: 'POST',
@@ -702,7 +705,63 @@ const fileUploader = (client) => {
                 else
                   throw CampaignException.AEM_ASSET_UPLOAD_FAILED(ex, ex.statusCode);
             }
+        },
+
+        /**
+         * Exposed public method of the fileUploader api,
+         * specifically designed to download files from the 'upload' folder of the Campaign instance
+         * @param {string} md5 md5 of the file content
+         * @param {string} ext (original) file extension
+         * @param {Object | undefined} options
+         * @param {string} options.fileName to rename the name in save as dialog of web browser 
+         * (force this dialog) must be in UTF-8
+         * @param {string} options.contentType change the content-type of the response (to help browser to
+         * handle this file) expl : image/png, text/plain;charset=ISO-8859-1
+         * @returns {Promise<File(string)>}
+         */
+        download: async (md5, ext, options) => {
+          if (!md5 || typeof md5 !== 'string') {
+            throw CampaignException.BAD_PARAMETER(
+                "md5",
+                md5,
+                "'md5' is mandatory parameter with type as 'string' for download file."
+              );
+          }
+
+          if (!ext || typeof ext !== "string") {
+            throw CampaignException.BAD_PARAMETER(
+                "ext",
+                ext,
+                "'ext' is mandatory parameter with type as 'string' for download file."
+              );
+          }
+
+          try {
+            const fileName =
+              options && options.fileName ? options.fileName : md5;
+            const contentType =
+              options && options.contentType ? options.contentType : "";
+
+            let queryString = `md5=${encodeURIComponent(md5)}&ext=${encodeURIComponent(ext)}&fileName=${encodeURIComponent(fileName)}`;
+
+            if (contentType) {
+              queryString += `&contentType=${encodeURIComponent(contentType)}`;
+            }
+
+            const headers = client._getAuthHeaders(false);
+            for (let h in client._connectionParameters._options.extraHttpHeaders)
+                headers[h] = client._connectionParameters._options.extraHttpHeaders[h];
+            const rawFileResponse = await client._makeHttpCall({
+              url: `${client._connectionParameters._endpoint}/nl/jsp/downloadFile.jsp?${queryString}`,
+              headers: headers,
+            });
+
+            return rawFileResponse;
+          } catch (ex) {
+            throw CampaignException.FILE_DOWNLOAD_FAILED(md5, ex);
+          }
         }
+
     };
 };
 

package/src/xtkJob.js

@@ -32,6 +32,7 @@ const { XtkCaster } = require("./xtkCaster.js");
  * @property {string} xtkschema - the method schema id. It can be ommited if the object has a xtkschema property
  * @property {any} object - the object ("this") to call the method with, possibly null for static methods. Should implement the xtk:job interface
  * @property {Array} args - the list of arguments to the SOAP call
+ * @property {(string|number)} [jobId] - the optional job id, which can be used for subsequent calls
  * @memberOf Campaign
  */
 
@@ -77,10 +78,11 @@ class XtkJobInterface {
      * @param {Campaign.XtkSoapCallSpec} soapCallSpec the definition of the SOAP call
      */
     constructor(client, soapCallSpec) {
+        this._reset();
         this._client = client;
         this._soapCall = soapCallSpec;
         this._maxLogCount = 100; // default fetch size
-        this._reset();
+        this.jobId = soapCallSpec ? soapCallSpec.jobId : undefined;
     }
 
     // Reset state before executing or submitting a job
@@ -110,7 +112,8 @@ class XtkJobInterface {
             client: this._client,
             object: this._soapCall.object,
             schemaId: 'xtk:jobInterface',
-            entitySchemaId: entitySchemaId
+            entitySchemaId: entitySchemaId,
+            headers: this._client._connectionParameters._options.extraHttpHeaders
         };
         var jobId = await callContext.client._callMethod("Execute", callContext, [ methodName ]);
         this.jobId = jobId;
@@ -133,7 +136,8 @@ class XtkJobInterface {
             client: this._client,
             object: this._soapCall.object,
             schemaId: 'xtk:jobInterface',
-            entitySchemaId: entitySchemaId
+            entitySchemaId: entitySchemaId,
+            headers: this._client._connectionParameters._options.extraHttpHeaders
         };
         var jobId = await callContext.client._callMethod("Submit", callContext, [ this._soapCall.method ]);
         this.jobId = jobId;
@@ -154,8 +158,8 @@ class XtkJobInterface {
             object: this._soapCall.object,
             schemaId: 'xtk:jobInterface',
             entitySchemaId: entitySchemaId,
+            headers: this._client._connectionParameters._options.extraHttpHeaders
         };
-
         const methodName = this._soapCall.method;
         var schema = await this._client.getSchema(entitySchemaId, "xml", true);
         if (!schema)