@adobe/acc-js-sdk 1.1.24 → 1.1.26

package/docs/changeLog.html

@@ -2,9 +2,33 @@
 layout: page
 title: Change Log
 ---
-<section class="changelog"><h1>Version 1.1.24</h1>
+ 
+<section class="changelog"><h1>Version 1.1.26</h1>
+  <h2>2023/04/17</h2>
+
+  <li>
+    Added support for IMS Bearer tokens without require any session and security tokens. See <a href="https://opensource.adobe.com/acc-js-sdk/connecting.html"> for more details.</a>
+  </li>
+  <li>
+    Fixed a bug causing incorrect JSON to XML transformation when the JSON object has a property named 'length'
+  </li>
+</section>
+
+<section class="changelog"><h1>Version 1.1.25</h1>
   <h2>2023/03/07</h2>
 
+  <li>
+    Added an (optional) parameter "options" to the file upload function. This parameter contains an "action" property whose value
+    can be "publishIfNeeded" or "none" and indicates which action the upload function should perform after it uploaded the file.
+    The default is "publishIfNeeded" which consists of creating a public resources with the file content and publishing it (making
+    it available publicly). The other action "none" means that no action is taken and that it is the responsibility of the caller
+    to post-process the uploaded file by calling the relevant APIs.
+  </li>
+</section>
+
+<section class="changelog"><h1>Version 1.1.24</h1>
+  <h2>2023/04/07</h2>
+
   <li>
     Added support for abortable requests. See <a href="https://opensource.adobe.com/acc-js-sdk/abortRequest.html"> for more details.</a>
   </li>

package/docs/connecting.html

@@ -51,19 +51,58 @@ await client.logoff();
     <li>Informations about the connected user, and it's privileges</li>
 </ul>
 
-<p>T
-    he most convenient way to access this information is by using the <a href="{{ site.baseurl }}/application.html">Application object</a>, but you can
+<p>The most convenient way to access this information is by using the <a href="{{ site.baseurl }}/application.html">Application object</a>, but you can
     also use the <b>client.getSessionInfo().serverInfo</b> and <b>client.getSessionInfo().sessionInfo</b> calls.
 </p>
 
+<p class="info">Note: depending on the type of credentials used, user and server info may not be returned.
+</p>
 
+<table>
+    <thead>
+        <tr>
+            <th>Credentials Type</th>
+            <th>Returns info</th>
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>UserPassword</td>
+            <td>Yes</td>
+        </tr>
+        <tr>
+            <td>ImsServiceToken</td>
+            <td>Yes</td>
+        </tr>
+        <tr>
+            <td>SessionToken</td>
+            <td>No</td>
+        </tr>
+        <tr>
+            <td>AnonymousUser</td>
+            <td>No</td>
+        </tr>
+        <tr>
+            <td>SecurityToken</td>
+            <td>Yes</td>
+        </tr>
+        <tr>
+            <td>BearerToken</td>
+            <td>Yes</td>
+        </tr>
+        <tr>
+            <td>ImsBearerToken</td>
+            <td>No</td>
+        </tr>
+    </tbody>
+</table>
 
 <h1>Credentials</h1>
 
 <p>
     There are several methods of the <b>sdk.ConnectionParameters</b> depending on the type of authentication you want to use. They are
     described below.
-</p>>
+</p>
 
 <h2>Login with user and password</h2>
 <p>This is the most common method to log in to Campaign. User the <b>ofUserAndPassword</b> function and pass it the user name and password</p>
@@ -75,7 +114,26 @@ const connectionParameters = sdk.ConnectionParameters.ofUserAndPassword(
 
 
 <h2>Login with IMS access token</h2>
-<p>The SDK supports IMS access token of an IMS user with the <b>ofBearerToken</b> function. Pass it a bearer token.</p>
+
+<p>In Campaign 8.5 and above, native support for IMS bearer tokens is avaiable and can be used in the SDK as the preferred connection method.</p>
+<pre class="code">
+    const connectionParameters = sdk.ConnectionParameters.ofImsBearerToken(
+                                    "https://myInstance.campaign.adobe.com", 
+                                    "ims_bearer_token");
+</pre>
+
+
+<p class="info">Note: You still need to call Logon
+</p>
+
+<p>With this authentication method, an IMS Bearer token is obtained outside of Campaign, for example using IMS APIs and is passed directly to 
+    all Campaign APIs. Campaigns itslef will verify the token and grant the corresponding access.
+</p>
+
+    
+<p>For older versions of Campaign, you can still use IMS tokens with the <b>ofBearerToken</b> function. The difference between ofImsBearerToken and ofBearerToken
+    is that ofBearerToken will internally call "xtk:session#BearerTokenLogon" to exchange the IMS token for Campaign session and security tokens. Subsequent
+    API calls will use Campaign tokens. It's recommended to us <b>ofImsBearerToken</b> logon whenever possible.</p>
 <pre class="code">
 const connectionParameters = sdk.ConnectionParameters.ofBearerToken(
                                 "https://myInstance.campaign.adobe.com", 

package/docs/samples.html

@@ -3,7 +3,7 @@ layout: page
 title: Sample Code
 ---
 
-<p>The <b>samples</b> folder contains several samples illustrating how to use the various Campaing APIs.</p>
+<p>The <b>samples</b> folder contains several samples illustrating how to use the various Campaign APIs.</p>
 
 <p>A sample file looks like this</p>
 

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.24",
+      "version": "1.1.26",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.2.1",

package/package.json

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

package/src/client.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 (function() {
 "use strict";
-
+/*jshint sub:true*/
 
 /**********************************************************************************
  *
@@ -244,12 +244,12 @@ class Credentials {
      */
     constructor(type, sessionToken, securityToken) {
         if (type != "UserPassword" && type != "ImsServiceToken" && type != "SessionToken" &&
-            type != "AnonymousUser" && type != "SecurityToken" && type != "BearerToken")
+            type != "AnonymousUser" && type != "SecurityToken" && type != "BearerToken" && type != "ImsBearerToken")
             throw CampaignException.INVALID_CREDENTIALS_TYPE(type);
         this._type = type;
         this._sessionToken = sessionToken || "";
         this._securityToken = securityToken || "";
-        if (type == "BearerToken") {
+        if (type == "BearerToken" || type === "ImsBearerToken") {
             this._bearerToken = sessionToken || "";
             this._sessionToken = "";
         }
@@ -397,8 +397,13 @@ class ConnectionParameters {
     }
 
     /**
-     * Creates connection parameters for a Campaign instance from bearer token
-     *
+     * Creates connection parameters for a Campaign instance from bearer token.
+     * This authentication method uses an IMS Bearer token and calls the xtk:session#BearerTokenLogin method
+     * which will exchange the IMS bearer token with Campaign session and security tokens.
+     * This is a legacy method. Campaign 8.5 will has an authentication method which allows to directly
+     * use the IMS bearer token and which is recommended. 
+     * To avoid an extra call to "BearerTokenLogin", use the "ofImsBearerToken" method.
+     * 
      * @param {string} endpoint The campaign endpoint (URL)
      * @param {string} bearerToken IMS bearer token
      * @param {*} options connection options
@@ -408,6 +413,23 @@ class ConnectionParameters {
         const credentials = new Credentials("BearerToken", bearerToken);
         return new ConnectionParameters(endpoint, credentials, options);
     }
+
+    /**
+     * Creates connection parameters for a Campaign instance from a IMS bearer token.
+     * This authentication method does not require exchange the IMS token with session and security tokens
+     * and only works in ACC 8.5 and above.
+     * For older version of ACC or to use session/seurity tokens, use the "ofBearerToken" method.
+     * 
+     * @param {string} endpoint The campaign endpoint (URL)
+     * @param {string} bearerToken IMS bearer token
+     * @param {*} options connection options
+     * @returns {ConnectionParameters} a ConnectionParameters object which can be used to create a Client
+     */
+    static ofImsBearerToken(endpoint, bearerToken, options) {
+        const credentials = new Credentials("ImsBearerToken", bearerToken);
+        return new ConnectionParameters(endpoint, credentials, options);
+    }
+
     /**
      * Creates connection parameters for a Campaign instance, using an IMS service token and a user name (the user to impersonate)
      *
@@ -520,6 +542,13 @@ class ConnectionParameters {
 // File Uploader
 // ========================================================================================
 
+/**
+ * @typedef {Object} FileUploadOptions
+ * @property {"publishIfNeeded"|"none"|undefined} the post-processing action to execute. Defaults to "publishIfNeeded"
+ * @memberOf Campaign
+ */
+
+
 /**
  * File Uploader API for JS SDK(Currently available only in browsers)
  * @private
@@ -535,26 +564,28 @@ const fileUploader = (client) => {
          * This is the exposed/public method for fileUploader instance which will do all the processing related to the upload process internally and returns the promise containing all the required data.
          * @ignore
          * @param file, where file is an instance of [File](https://developer.mozilla.org/en-US/docs/Web/API/File)
+         * @param {FileUploadOptions|undefined} options
          * @returns {Promise<{name: string, md5: string, type: string, size: string, url: string}>}
          */
-        upload: (file) => {
+        upload: (file, options) => {
             console.log(`fileuploader.upload is an experimental feature and is not currently fully functional. It is work in progress and will change in the future.`);
             return new Promise((resolve, reject) => {
+                const action = (options && options.action) ? options.action : "publishIfNeeded";
+                if (action !== "publishIfNeeded" && action !== "none")
+                    reject(CampaignException.BAD_PARAMETER("action", action, "The 'action' parameter of the upload API should be 'publishIfNeeded' or 'none'"));
                 try {
                     if (!Util.isBrowser()) {
                         throw 'File uploading is only supported in browser based calls.';
                     }
                     const data = new FormData();
                     data.append('file_noMd5', file);
+                    const headers = client._getAuthHeaders(false);
                     client._makeHttpCall({
                         url: `${client._connectionParameters._endpoint}/nl/jsp/uploadFile.jsp`,
                         processData: false,
                         method: 'POST',
                         data: data,
-                        headers: {
-                            'X-Security-Token': client._securityToken,
-                            'X-Session-Token': client._sessionToken,
-                        }
+                        headers: headers
                     }).then((okay) => {
                         if (!okay.startsWith('Ok')) {
                             throw okay;
@@ -569,28 +600,31 @@ const fileUploader = (client) => {
                                     // https://git.corp.adobe.com/Campaign/ac/blob/v6-master/wpp/xtk/web/dce/uploader.js
                                     return reject(CampaignException.FILE_UPLOAD_FAILED(file.name, 'Malformed data:' + data.toString()));
                                 }
-                                const counter = await client.NLWS.xtkCounter.increaseValue({name: 'xtkResource'});
-                                const fileRes= {
-                                    internalName: 'RES' + counter,
-                                    md5: data[0].md5,
-                                    label: data[0].fileName,
-                                    fileName: data[0].fileName,
-                                    originalName: data[0].fileName,
-                                    useMd5AsFilename: '1',
-                                    storageType: 5,
-                                    xtkschema: 'xtk:fileRes'
-
-                                };
-                                await client.NLWS.xtkSession.write(fileRes);
-                                await client.NLWS.xtkFileRes.create(fileRes).publishIfNeeded();
-                                const url = await client.NLWS.xtkFileRes.create(fileRes).getURL();
-                                resolve({
+                                const result = {
                                     name: data[0].fileName,
                                     md5: data[0].md5,
                                     type: file.type,
                                     size: file.size,
-                                    url: url
-                                });
+                                };
+                                if (action === "publishIfNeeded") {
+                                    const counter = await client.NLWS.xtkCounter.increaseValue({name: 'xtkResource'});
+                                    const fileRes= {
+                                        internalName: 'RES' + counter,
+                                        md5: data[0].md5,
+                                        label: data[0].fileName,
+                                        fileName: data[0].fileName,
+                                        originalName: data[0].fileName,
+                                        useMd5AsFilename: '1',
+                                        storageType: 5,
+                                        xtkschema: 'xtk:fileRes'
+
+                                    };
+                                    await client.NLWS.xtkSession.write(fileRes);
+                                    await client.NLWS.xtkFileRes.create(fileRes).publishIfNeeded();
+                                    const url = await client.NLWS.xtkFileRes.create(fileRes).getURL();
+                                    result.url = url;
+                                }
+                                resolve(result);
                             }
                         };
                         const html = `<body>${okay}</body>`;
@@ -631,13 +665,28 @@ class Client {
      */
     constructor(sdk, connectionParameters) {
         this.sdk = sdk;
+        this.reinit(connectionParameters);
+
+        this._observers = [];
+        this._cacheChangeListeners = [];
+    }
+
+    /**
+     * Re-initialize a client with new connection parameters.
+     * Typically called from the refreshClient callback after a connection expires.
+     * Conserves observers
+     *
+     * @param {Campaign.ConnectionParameters} user user name, for instance admin
+     */
+    reinit(connectionParameters) {
         this._connectionParameters = connectionParameters; // ## TODO security concern (password kept in memory)
         this._representation = connectionParameters._options.representation;
 
         this._sessionInfo = undefined;
         this._sessionToken = undefined;
         this._securityToken = undefined;
-        this._installedPackages = {};     // package set (key and value = package id, ex: "nms:amp")
+        this._bearerToken = undefined;      // set when using Bearer authentication and "ImsBearer" credential type
+        this._installedPackages = {};       // package set (key and value = package id, ex: "nms:amp")
 
         this._secretKeyCipher = undefined;
 
@@ -653,7 +702,7 @@ class Client {
         const rootKeyType = connectionParameters._options.cacheRootKey;
         let rootKey = "";
         if (!rootKeyType || rootKeyType === "default")
-            rootKey = `acc.js.sdk.${sdk.getSDKVersion().version}.${instanceKey}.cache.`;
+            rootKey = `acc.js.sdk.${this.sdk.getSDKVersion().version}.${instanceKey}.cache.`;
 
         // Clear storage cache if the sdk versions or the instances are different
         if (this._storage && typeof this._storage.removeItem === 'function') {
@@ -673,8 +722,6 @@ class Client {
 
         this._transport = connectionParameters._options.transport;
         this._traceAPICalls = connectionParameters._options.traceAPICalls;
-        this._observers = [];
-        this._cacheChangeListeners = [];
         this._refreshClient = connectionParameters._options.refreshClient;
 
         // expose utilities
@@ -735,6 +782,26 @@ class Client {
         return `${version.name}/${version.version} ${version.description}`;
     }
 
+    /**
+     * Get HTTP authentication headers
+     * @param
+     * @returns {Object} the headers
+     */
+    _getAuthHeaders(setCookie) {
+        const headers = {};
+        if (this._bearerToken) {
+            headers['Authorization'] = `Bearer ${this._bearerToken}`;
+        }
+        else {
+            headers['X-Security-Token'] = this._securityToken;
+            headers['X-Session-Token'] = this._sessionToken;
+            if (setCookie) {
+                headers['Cookie'] = '__sessiontoken=' + this._sessionToken;
+            }
+        }
+        return headers;
+    }
+
     /**
      * Convert an XML object into a representation
      *
@@ -915,6 +982,9 @@ class Client {
         const credentialsType = this._connectionParameters._credentials._type;
         if (credentialsType == "AnonymousUser")
             return true;
+        else if (credentialsType == "ImsBearerToken") {
+            return !!this._bearerToken;
+        }
 
         // When using bearer token authentication we are considered logged only after
         // the bearer token has been converted into session token and security token
@@ -953,7 +1023,8 @@ class Client {
                                             this._sessionToken, this._securityToken,
                                             this._getUserAgentString(),
                                             Object.assign({}, this._connectionParameters._options, pushDownOptions),
-                                            extraHttpHeaders);
+                                            extraHttpHeaders,
+                                            this._bearerToken);
         soapCall.internal = !!internal;
         soapCall.isStatic = isStatic;
         return soapCall;
@@ -1310,6 +1381,7 @@ class Client {
         this.application = null;
         this._sessionToken = "";
         this._securityToken = "";
+        this._bearerToken = undefined;
         const credentials = this._connectionParameters._credentials;
 
         const sdkVersion = this.sdk.getSDKVersion();
@@ -1335,6 +1407,7 @@ class Client {
             that._installedPackages = {};
             that._sessionToken = credentials._sessionToken;
             that._securityToken = "";
+            that._bearerToken = undefined;
             that._onLogon();
             return Promise.resolve();
         }
@@ -1343,6 +1416,16 @@ class Client {
             that._installedPackages = {};
             that._sessionToken = "";
             that._securityToken = credentials._securityToken;
+            that._bearerToken = undefined;
+            that._onLogon();
+            return Promise.resolve();
+        }
+        else if (credentials._type == "ImsBearerToken") {
+            that._sessionInfo = undefined;
+            that._installedPackages = {};
+            that._sessionToken = "";
+            that._securityToken = "";
+            that._bearerToken = credentials._bearerToken;
             that._onLogon();
             return Promise.resolve();
         }
@@ -1393,6 +1476,7 @@ class Client {
                 // store member variables after all parameters are decode the ensure atomicity
                 that._sessionToken = sessionToken;
                 that._securityToken = securityToken;
+                that._bearerToken = undefined;
 
                 that._onLogon();
             });
@@ -1430,6 +1514,7 @@ class Client {
                 return this._makeSoapCall(soapCall).then(function() {
                     that._sessionToken = "";
                     that._securityToken = "";
+                    that._bearerToken = undefined;
                     that.application = null;
                     soapCall.checkNoMoreArgs();
                 });
@@ -1437,6 +1522,7 @@ class Client {
             else {
                 that._sessionToken = "";
                 that._securityToken = "";
+                that._bearerToken = undefined;
                 that.application = null;
             }
         } finally {
@@ -1900,13 +1986,10 @@ class Client {
      * @returns {Campaign.PingStatus} an object describing the server status
      */
     async ping() {
+        const headers = this._getAuthHeaders(true);
         const request = {
             url: `${this._connectionParameters._endpoint}/nl/jsp/ping.jsp`,
-            headers: {
-                'X-Security-Token': this._securityToken,
-                'X-Session-Token': this._sessionToken,
-                'Cookie': '__sessiontoken=' + this._sessionToken
-            }
+            headers: headers,
         };
         for (let h in this._connectionParameters._options.extraHttpHeaders)
             request.headers[h] = this._connectionParameters._options.extraHttpHeaders[h];
@@ -1939,14 +2022,12 @@ class Client {
                 callContext.formData.ctx = DomUtil.toXMLString(xmlCtx);
             }
             const selectionCount = callContext.selection.split(',').length;
-
+            
+            const headers = this._getAuthHeaders(false);
+            headers['Content-Type'] = 'application/x-www-form-urlencoded';
             const request = {
                 url: `${this._connectionParameters._endpoint}/report/${callContext.reportName}?${encodeURI(`_noRender=true&_schema=${callContext.schema}&_context=${callContext.context}&_selection=${callContext.selection}`)}&_selectionCount=${selectionCount}`,
-                headers: {
-                    'X-Security-Token': this._securityToken,
-                    'X-Session-Token': this._sessionToken,
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                },
+                headers: headers,
                 method: 'POST',
                 data : qsStringify(callContext.formData)
             };
@@ -1971,13 +2052,10 @@ class Client {
      * @returns {Campaign.McPingStatus} an object describing Message Center server status
      */
     async mcPing() {
+        const headers = this._getAuthHeaders(true);
         const request = {
             url: `${this._connectionParameters._endpoint}/nl/jsp/mcPing.jsp`,
-            headers: {
-                'X-Security-Token': this._securityToken,
-                'X-Session-Token': this._sessionToken,
-                'Cookie': '__sessiontoken=' + this._sessionToken
-            }
+            headers: headers
         };
         for (let h in this._connectionParameters._options.extraHttpHeaders)
             request.headers[h] = this._connectionParameters._options.extraHttpHeaders[h];

package/src/domUtil.js

@@ -341,20 +341,18 @@ class DomUtil {
                     xmlElement.textContent = value;
                     xmlRoot.appendChild(xmlElement);
                 }
-                else if (t == "object") {
-                    if (value.length !== undefined && value.length !== null) {
-                        for (var i=0; i<value.length; i++) {
-                            const xmlElement = doc.createElement(att);
-                            this._fromJSON(doc, xmlElement, value[i], flavor);
-                            xmlRoot.appendChild(xmlElement);
-                        }
-                    }
-                    else {
+                else if (Util.isArray(value)) {
+                    for (var i=0; i<value.length; i++) {
                         const xmlElement = doc.createElement(att);
-                        this._fromJSON(doc, xmlElement, value, flavor);
+                        this._fromJSON(doc, xmlElement, value[i], flavor);
                         xmlRoot.appendChild(xmlElement);
                     }
                 }
+                else if (t == "object") {
+                    const xmlElement = doc.createElement(att);
+                    this._fromJSON(doc, xmlElement, value, flavor);
+                    xmlRoot.appendChild(xmlElement);
+                }
                 else
                     throw new DomException(`Cannot cast JSON to XML: element '${att}' type '${t}' is unknown or not supported yet`);
             }

package/src/soap.js

@@ -11,7 +11,7 @@ governing permissions and limitations under the License.
 */
 (function() {
 "use strict";    
-    
+/*jshint sub:true*/
 
 /**********************************************************************************
  * 
@@ -80,11 +80,12 @@ const NS_XSD = "http://www.w3.org/2001/XMLSchema";
  * @param {string} userAgentString The user agent string to use for HTTP requests
  * @param {string} pushDownOptions Options to push down to the request (comes from connectionParameters._options)
  * @param {{ name:string, value:string}} extraHttpHeaders key/value pair of HTTP header (will override any other headers)
+ * @param {string} bearerToken The bearer token to use for HTTP requests. Only required for ImsBearerToken authentication
  * @memberof SOAP
  */
 class SoapMethodCall {
     
-    constructor(transport, urn, methodName, sessionToken, securityToken, userAgentString, pushDownOptions, extraHttpHeaders) {
+    constructor(transport, urn, methodName, sessionToken, securityToken, userAgentString, pushDownOptions, extraHttpHeaders, bearerToken) {
         this.request = undefined;       // The HTTP request (object literal passed to the transport layer)
         this.requestOptions = undefined;
         this.response = undefined;      // The HTTP response object (in case of success)
@@ -103,6 +104,7 @@ class SoapMethodCall {
 
         this._sessionToken = sessionToken || "";
         this._securityToken = securityToken || "";
+        this._bearerToken = bearerToken; // may be undefined if not using bearer token authentication
         this._userAgentString = userAgentString;
         this._pushDownOptions = pushDownOptions || {};
         this._charset = this._pushDownOptions.charset || '';
@@ -538,9 +540,14 @@ class SoapMethodCall {
         const headers = {
             'Content-type': `application/soap+xml${this._charset ? ";charset=" + this._charset : ""}`,
             'SoapAction': `${this.urn}#${this.methodName}`,
-            'X-Security-Token': this._securityToken,
-            'X-Session-Token': this._sessionToken,
         };
+        if (this._bearerToken) {
+            headers['Authorization'] = `Bearer ${this._bearerToken}`;
+        }
+        else {
+            headers['X-Security-Token'] = this._securityToken;
+            headers['X-Session-Token'] = this._sessionToken;
+        }
 
         // Add HTTP headers specific to the SOAP call for better tracing/troubleshooting
         if (this._extraHttpHeaders && this._extraHttpHeaders['ACC-SDK-Version']) {
@@ -579,6 +586,7 @@ class SoapMethodCall {
         if (client) {
             this._sessionToken = client._sessionToken;
             this._securityToken = client._securityToken;
+            this._bearerToken = client._bearerToken;
         }
 
         var cookieHeader = DomUtil.findElement(this._header, "Cookie");

package/src/util.js

@@ -51,18 +51,7 @@ class Util {
    * @returns {boolean} true if the object is an array
    */
   static isArray(obj) {
-    if (obj === null || obj === undefined) return false;
-    // JavaScript arrays are objects
-    if (typeof obj != "object") return false;
-    // They also have a length property. But checking the length is not enough
-    // since, it can also be an object literal with a "length" property. Campaign
-    // schema attributes typically have a "length" attribute and are not arrays
-    if (obj.length === undefined || obj.length === null) return false;
-    // So check for a "push" function
-    if (obj.push === undefined || obj.push === null) return false;
-    if (typeof obj.push != "function") 
-        return false;
-    return true;
+    return Array.isArray(obj);
   }
 
   // Helper function for trim() to replace text between 2 indices

package/test/client.test.js

@@ -3511,8 +3511,115 @@ describe('ACC Client', function () {
             }).catch((ex) => {
                 expect(ex.message).toMatch('500 - Error 16384: SDK-000013 "Failed to upload file abcd.txt. Malformed data:');
             })
+        });
 
-        })
+        it("Should support 'publishIfNeeded' action", async () => {
+            // Create a mock client and logon
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            // Mock the upload protocol
+            // - the upload.jsp (which returns the content of an iframe and JS to eval)
+            // - call to xtk:counter#IncreaseValue (first, retrieve the schema xtk:counter then call the function)
+            // - call to xtk:session#Write
+            // - call to xtk:fileRes#PublishIfNeeded
+            // - call to xtk:fileRes#GetURL
+
+            client._transport.mockReturnValueOnce(Promise.resolve(`Ok 
+        <html xmlns="http://www.w3.org/1999/xhtml">
+            <head>
+              <script type="text/javascript">if(window.parent&&window.parent.document.controller&&"function"==typeof window.parent.document.controller.uploadFileCallBack){var aFilesInfo=new Array;aFilesInfo.push({paramName:"file",fileName:"test.txt",newFileName:"d8e8fca2dc0f896fd7cb4cb0031ba249.txt",md5:"d8e8fca2dc0f896fd7cb4cb0031ba249"}),window.parent.document.controller.uploadFileCallBack(aFilesInfo)}</script>
+            </head>
+        <body></body>
+        </html>`)); // upload.jsp
+
+            client._transport.mockReturnValueOnce(Promise.resolve(Mock.GET_XTK_COUNTER_RESPONSE)); // GetEntityIfMoreRecentResponse - counter
+            client._transport.mockReturnValueOnce(Mock.INCREASE_VALUE_RESPONSE); // xtk:counter#IncreaseValue
+
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE); // GetEntityIfMoreRecentResponse - session
+            client._transport.mockReturnValueOnce(Mock.FILE_RES_WRITE_RESPONSE); // xtk:session#Write
+
+            client._transport.mockReturnValueOnce(Promise.resolve(Mock.GET_FILERES_QUERY_SCHEMA_RESPONSE)); // GetEntityIfMoreRecentResponse - fileRes
+            client._transport.mockReturnValueOnce(Promise.resolve(Mock.PUBLISH_IF_NEEDED_RESPONSE)); // xtk:fileRes#PublishIfNeeded
+
+            client._transport.mockReturnValueOnce(Promise.resolve(Mock.GET_URL_RESPONSE)); // xtk:fileRes#GetURL
+
+            // Call upload
+            const result = await client.fileUploader.upload({
+                type: 'text/html',
+                size: 12345
+            }, { action: "publishIfNeeded" });
+
+            expect(result).toMatchObject({
+                md5: "d8e8fca2dc0f896fd7cb4cb0031ba249",
+                name: "test.txt",
+                size: 12345,
+                type: "text/html",
+                url: "http://hello.com"
+            });
+        });
+
+        it("Should support 'none' action", async () => {
+            // Create a mock client and logon
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            // Mock the upload protocol
+            // With the "none" action, we skip the counter & publication
+            // - the upload.jsp (which returns the content of an iframe and JS to eval)
+            client._transport.mockReturnValueOnce(Promise.resolve(`Ok 
+        <html xmlns="http://www.w3.org/1999/xhtml">
+            <head>
+              <script type="text/javascript">if(window.parent&&window.parent.document.controller&&"function"==typeof window.parent.document.controller.uploadFileCallBack){var aFilesInfo=new Array;aFilesInfo.push({paramName:"file",fileName:"test.txt",newFileName:"d8e8fca2dc0f896fd7cb4cb0031ba249.txt",md5:"d8e8fca2dc0f896fd7cb4cb0031ba249"}),window.parent.document.controller.uploadFileCallBack(aFilesInfo)}</script>
+            </head>
+        <body></body>
+        </html>`)); // upload.jsp
+
+            // Call upload
+            const result = await client.fileUploader.upload({
+                type: 'text/html',
+                size: 12345
+            }, { action: "none" });
+
+            expect(result).toMatchObject({
+                md5: "d8e8fca2dc0f896fd7cb4cb0031ba249",
+                name: "test.txt",
+                size: 12345,
+                type: "text/html",
+            });
+            expect(result.url).toBeUndefined();
+        });
+
+        it("Should failed with invalid action", async () => {
+            // Create a mock client and logon
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            // Mock the upload protocol
+            // With the "none" action, we skip the counter & publication
+            // - the upload.jsp (which returns the content of an iframe and JS to eval)
+            client._transport.mockReturnValueOnce(Promise.resolve(`Ok 
+        <html xmlns="http://www.w3.org/1999/xhtml">
+            <head>
+              <script type="text/javascript">if(window.parent&&window.parent.document.controller&&"function"==typeof window.parent.document.controller.uploadFileCallBack){var aFilesInfo=new Array;aFilesInfo.push({paramName:"file",fileName:"test.txt",newFileName:"d8e8fca2dc0f896fd7cb4cb0031ba249.txt",md5:"d8e8fca2dc0f896fd7cb4cb0031ba249"}),window.parent.document.controller.uploadFileCallBack(aFilesInfo)}</script>
+            </head>
+        <body></body>
+        </html>`)); // upload.jsp
+
+            // Call upload
+            await expect(client.fileUploader.upload({
+                type: 'text/html',
+                size: 12345
+            }, { action: "invalid" })).rejects.toMatchObject({
+                errorCode: "SDK-000006", 
+                "faultCode": 16384, 
+                "faultString": "Bad parameter 'action' with value 'invalid'", 
+                "statusCode": 400
+            });
+        });
     });
 
     describe("Setting the xtkschema attribute", () => {

package/test/domUtil.test.js

@@ -157,6 +157,20 @@ describe('DomUtil', function() {
             assert.strictEqual(fromJSON({ "a": null }), '<root/>');
             assert.strictEqual(fromJSON({ "a": undefined }), '<root/>');
         });
+
+        it("Should support attributes named 'length'", () => {
+            const json = {
+                element: {
+                  attribute: {
+                    length: "256",
+                    name: "id",
+                  },
+              }
+            };
+            const doc = DomUtil.fromJSON("extension", json);
+            const xml = DomUtil.toXMLString(doc);
+            expect(xml).toEqual('<extension><element><attribute length="256" name="id"/></element></extension>');
+        });
     });
 
     describe('fromJSON (default)', function() {

package/test/imBearerToken.test.js

@@ -0,0 +1,174 @@
+/*
+Copyright 2023 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.
+*/
+
+
+/**********************************************************************************
+ *
+ * Unit tests for IMS Bearer Token authentication
+ *
+ *********************************************************************************/
+const sdk = require('../src/index.js');
+const Mock = require('./mock.js').Mock;
+
+describe('IMS Bearer Toekn', function () {
+
+    async function makeImsClient(options) {
+        const connectionParameters = sdk.ConnectionParameters.ofImsBearerToken("http://acc-sdk:8080", "ey...", options);
+        const client = await sdk.init(connectionParameters);
+        if (!options || !options.transport) // allow tests to explicitely set the transport
+          client._transport = jest.fn();
+        return client;
+      }
+
+    it('Should logon with IMS Bearer Token', async () => {
+        const client = await makeImsClient();
+        // No "Logon" API call is made when using IMS Bearer Token
+        //client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+        await client.NLWS.xtkSession.logon();
+        expect(client.isLogged()).toBe(true);
+    });
+
+    // The logoff API invalidates the session created on the server side and does not invalidate 
+    // the bearer token. To invalidate the bearer token, IMS should be used
+    it('Should logoff', async () => {
+        const client = await makeImsClient();
+        await client.NLWS.xtkSession.logon();
+
+        client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
+        await client.NLWS.xtkSession.logoff();
+        expect(client.isLogged()).toBe(false);
+
+        expect(client._transport).toBeCalledTimes(1);
+        const calls = client._transport.mock.calls;
+        expect(calls[0][0].headers).toMatchObject({
+            "ACC-SDK-Auth": "ImsBearerToken",
+            "Authorization": "Bearer ey..."
+        });
+        expect(calls[0][0].headers["X-Security-Token"]).toBeUndefined();
+        expect(calls[0][0].headers["X-Session-Token"]).toBeUndefined();
+    });
+
+    it('Should call API with Bearer Token', async () => {
+        const client = await makeImsClient();
+        await client.NLWS.xtkSession.logon();
+
+        // Get Option
+        client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+        client._transport.mockReturnValueOnce(Mock.GET_DATABASEID_RESPONSE);
+        var databaseId = await client.getOption("XtkDatabaseId");
+        expect(databaseId).toBe("uFE80000000000000F1FA913DD7CC7C480041161C");
+
+        // Check that headers were correctly populated for both calls
+        expect(client._transport).toBeCalledTimes(2);
+        const calls = client._transport.mock.calls;
+        expect(calls[0][0].headers).toMatchObject({
+            "ACC-SDK-Auth": "ImsBearerToken",
+            "ACC-SDK-Call-Internal": "1",
+            "Authorization": "Bearer ey..."
+        });
+        expect(calls[0][0].headers["X-Security-Token"]).toBeUndefined();
+        expect(calls[0][0].headers["X-Session-Token"]).toBeUndefined();
+
+        expect(calls[1][0].headers).toMatchObject({
+            "ACC-SDK-Auth": "ImsBearerToken",
+            "Authorization": "Bearer ey..."
+        });
+        expect(calls[1][0].headers["ACC-SDK-Call-Internal"]).toBeUndefined();
+        expect(calls[1][0].headers["X-Security-Token"]).toBeUndefined();
+        expect(calls[1][0].headers["X-Session-Token"]).toBeUndefined();
+    });
+
+    it("Expired session refresh client callback", async () => {
+
+        const refreshClient = async (client) => {
+            const connectionParameters = sdk.ConnectionParameters.ofImsBearerToken("http://acc-sdk:8080", "ey2...", options);
+            client.reinit(connectionParameters);
+            await client.NLWS.xtkSession.logon();
+            return client;
+        };
+
+        const transport = jest.fn();
+        const options = {
+            transport: transport,
+            refreshClient: refreshClient,
+        };
+        const connectionParameters = sdk.ConnectionParameters.ofImsBearerToken("http://acc-sdk:8080", "ey1...", options);
+        const client = await sdk.init(connectionParameters);
+        await client.NLWS.xtkSession.logon();
+
+        client._transport.mockReturnValueOnce(Promise.resolve(`XSV-350008 Session has expired or is invalid. Please reconnect.`));
+        client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+        client._transport.mockReturnValueOnce(Mock.GET_DATABASEID_RESPONSE);
+        var databaseId = await client.getOption("XtkDatabaseId");
+        expect(databaseId).toBe("uFE80000000000000F1FA913DD7CC7C480041161C");
+        const lastCall = client._transport.mock.calls[client._transport.mock.calls.length - 1];
+        expect(lastCall[0].headers).toMatchObject({
+            "ACC-SDK-Auth": "ImsBearerToken",
+            "Authorization": "Bearer ey2..."
+        });
+        expect(lastCall[0].headers["X-Security-Token"]).toBeUndefined();
+        expect(lastCall[0].headers["X-Session-Token"]).toBeUndefined();
+    });
+
+
+    it("Should call ping API", async () => {
+        const client = await makeImsClient();
+        await client.NLWS.xtkSession.logon();
+
+        client._transport.mockReturnValueOnce(Mock.PING);
+        const ping = await client.ping();
+        expect(ping.status).toBe("OK");
+        expect(ping.timestamp).toBe("2021-08-27 15:43:48.862Z");
+
+        const lastCall = client._transport.mock.calls[client._transport.mock.calls.length - 1];
+        expect(lastCall[0].headers).toMatchObject({
+            "ACC-SDK-Auth": "ImsBearerToken",
+            "Authorization": "Bearer ey..."
+        });
+        expect(lastCall[0].headers["X-Security-Token"]).toBeUndefined();
+        expect(lastCall[0].headers["X-Session-Token"]).toBeUndefined();
+    });
+
+    it("Should call mcPing API", async () => {
+        const client = await makeImsClient();
+        await client.NLWS.xtkSession.logon();
+
+        client._transport.mockReturnValueOnce(Mock.MC_PING);
+        const ping = await client.mcPing();
+        expect(ping.status).toBe("Ok");
+
+        const lastCall = client._transport.mock.calls[client._transport.mock.calls.length - 1];
+        expect(lastCall[0].headers).toMatchObject({
+            "ACC-SDK-Auth": "ImsBearerToken",
+            "Authorization": "Bearer ey..."
+        });
+        expect(lastCall[0].headers["X-Security-Token"]).toBeUndefined();
+        expect(lastCall[0].headers["X-Session-Token"]).toBeUndefined();
+    });
+
+    it("Should allow to use the application object", async () => {
+        const client = await makeImsClient();
+        await client.NLWS.xtkSession.logon();
+        const application = client.application;
+        expect(application).toBeDefined();
+
+        client._transport.mockReturnValueOnce(Mock.GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE);
+        const schema = await application.getSchema("nms:extAccount");
+        expect(schema).toBeDefined();
+        expect(schema.name).toBe("extAccount");
+
+        // But the application object does not have any info about packages
+        // since we are using a bearer token. Packages are only available
+        // when using one of the Logon methods (Logno or BearertokenLogon)
+        expect(application.packages).toBeUndefined();
+    });
+});