@adobe/acc-js-sdk 1.0.5 → 1.0.8

package/test/crypto.test.js

@@ -19,61 +19,65 @@ governing permissions and limitations under the License.
 
 const assert = require('assert');
 const crypto = require('../src/crypto.js');
+const { Mock } = require('./mock.js');
 const Cipher = crypto.Cipher;
 
 describe('crypto', function() {
     
     it("Should decrypt password", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
-        var decrypted = cipher.decryptPassword("@57QS5VHMb9BCsojLVrKI/Q==");
+        const cipher = new Cipher(Mock.makeKey());
+        const encrypted = cipher.encryptPassword("mid");
+        var decrypted = cipher.decryptPassword(encrypted);
         assert.equal(decrypted, "mid");
     });
 
     it("Should fail on invalid encrypted string", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
+        const cipher = new Cipher(Mock.makeKey());
         assert.throws(function() {
             cipher.decryptPassword("Hello");
         });
     });
 
     it("Should decrypt password twice", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
-        var decrypted = cipher.decryptPassword("@57QS5VHMb9BCsojLVrKI/Q==");
+        const cipher = new Cipher(Mock.makeKey());
+        const encrypted = cipher.encryptPassword("mid");
+        var decrypted = cipher.decryptPassword(encrypted);
         assert.equal(decrypted, "mid");
-         decrypted = cipher.decryptPassword("@57QS5VHMb9BCsojLVrKI/Q==");
+         decrypted = cipher.decryptPassword(encrypted);
         assert.equal(decrypted, "mid");
     });
 
     it("Should decrypt password after failure", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
+        const cipher = new Cipher(Mock.makeKey());
         assert.throws(function() {
             cipher.decryptPassword("@Hello");
         });
         // make sure state is valid after failure
-        var decrypted = cipher.decryptPassword("@57QS5VHMb9BCsojLVrKI/Q==");
+        const encrypted = cipher.encryptPassword("mid");
+        var decrypted = cipher.decryptPassword(encrypted);
         assert.equal(decrypted, "mid");
     });
 
     it("Should handle plain text passwords", function() {
-        const cipher = new Cipher("llL97E5mAvLTxgT1fsAH2kjLqZXKCGHfDyR9q0C6Ivs=");
+        const cipher = new Cipher(Mock.makeKey());
         var decrypted = cipher.decryptPassword("__PLAINTEXT__pass");
         assert.equal(decrypted, "pass");
     });
 
     it("Should fail if no marker", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
+        const cipher = new Cipher(Mock.makeKey());
         expect(() => { cipher.decryptPassword("57QS5VHMb9BCsojLVrKI/Q=="); }).toThrow("SDK-000011");
     });
 
     it("Should support empty passwords", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
+        const cipher = new Cipher(Mock.makeKey());
         assert.equal(cipher.decryptPassword(""), "");
         assert.equal(cipher.decryptPassword(null), "");
         assert.equal(cipher.decryptPassword(undefined), "");
     });
 
     it("Encrypt - decrypt", function() {
-        const cipher = new Cipher("HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=");
+        const cipher = new Cipher(Mock.makeKey());
         expect(cipher.decryptPassword(cipher.encryptPassword(""))).toBe("");
         expect(cipher.decryptPassword(cipher.encryptPassword("1"))).toBe("1");
         expect(cipher.decryptPassword(cipher.encryptPassword("Hello"))).toBe("Hello");

package/test/domUtil.test.js

@@ -18,8 +18,7 @@ governing permissions and limitations under the License.
  *********************************************************************************/
 
 const assert = require('assert');
-const { DomUtil } = require('../src/domUtil.js');
-const { Util } = require('../src/util.js');
+const { DomUtil, XPath, XPathElement } = require('../src/domUtil.js');
 
 
 describe('DomUtil', function() {
@@ -546,4 +545,153 @@ describe('DomUtil', function() {
         });
     });
 
+    describe("XPath", () => {
+
+        it("Should create XPath", () => {
+            expect(new XPath("").asString()).toBe("");
+            expect(new XPath(" ").asString()).toBe("");
+            expect(new XPath(null).asString()).toBe("");
+            expect(new XPath(undefined).asString()).toBe("");
+            expect(new XPath("@name").asString()).toBe("@name");
+            expect(new XPath("country/@name").asString()).toBe("country/@name");
+            expect(new XPath("..").asString()).toBe("..");
+            expect(new XPath(".").asString()).toBe(".");
+        })
+
+        it("Should create expanded XPath", () => {
+            expect(new XPath("[@name]").asString()).toBe("@name");
+            expect(new XPath("[country/@name]").asString()).toBe("country/@name");
+        })
+
+        it("toString", () => {
+            expect(new XPath("").toString()).toBe("");
+            expect(new XPath(" ").toString()).toBe("");
+            expect(new XPath(null).toString()).toBe("");
+            expect(new XPath(undefined).toString()).toBe("");
+            expect(new XPath("@name").toString()).toBe("@name");
+            expect(new XPath("country/@name").toString()).toBe("country/@name");
+            expect(new XPath("..").toString()).toBe("..");
+            expect(new XPath(".").toString()).toBe(".");
+        })
+
+        it("Should test empty XPath", () => {
+            expect(new XPath("").isEmpty()).toBe(true);
+            expect(new XPath(" ").isEmpty()).toBe(true);
+            expect(new XPath(null).isEmpty()).toBe(true);
+            expect(new XPath(undefined).isEmpty()).toBe(true);
+            expect(new XPath("@name").isEmpty()).toBe(false);
+            expect(new XPath("country/@name").isEmpty()).toBe(false);
+            expect(new XPath("..").isEmpty()).toBe(false);
+            expect(new XPath(".").isEmpty()).toBe(false);
+        })
+
+        it("Should test absolute XPath", () => {
+            expect(new XPath("").isAbsolute()).toBe(false);
+            expect(new XPath(" ").isAbsolute()).toBe(false);
+            expect(new XPath(null).isAbsolute()).toBe(false);
+            expect(new XPath(undefined).isAbsolute()).toBe(false);
+            expect(new XPath("@name").isAbsolute()).toBe(false);
+            expect(new XPath("country/@name").isAbsolute()).toBe(false);
+            expect(new XPath("..").isAbsolute()).toBe(false);
+            expect(new XPath(".").isAbsolute()).toBe(false);
+            expect(new XPath("/").isAbsolute()).toBe(true);
+            expect(new XPath("/country/@name").isAbsolute()).toBe(true);
+        })
+
+        it("Should test self XPath", () => {
+            expect(new XPath("").isSelf()).toBe(false);
+            expect(new XPath(" ").isSelf()).toBe(false);
+            expect(new XPath(null).isSelf()).toBe(false);
+            expect(new XPath(undefined).isSelf()).toBe(false);
+            expect(new XPath("@name").isSelf()).toBe(false);
+            expect(new XPath("country/@name").isSelf()).toBe(false);
+            expect(new XPath("..").isSelf()).toBe(false);
+            expect(new XPath(".").isSelf()).toBe(true);
+            expect(new XPath("/").isSelf()).toBe(false);
+            expect(new XPath("/country/@name").isSelf()).toBe(false);
+        })
+
+        it("Should test root XPath", () => {
+            expect(new XPath("").isRootPath()).toBe(false);
+            expect(new XPath(" ").isRootPath()).toBe(false);
+            expect(new XPath(null).isRootPath()).toBe(false);
+            expect(new XPath(undefined).isRootPath()).toBe(false);
+            expect(new XPath("@name").isRootPath()).toBe(false);
+            expect(new XPath("country/@name").isRootPath()).toBe(false);
+            expect(new XPath("..").isRootPath()).toBe(false);
+            expect(new XPath(".").isRootPath()).toBe(false);
+            expect(new XPath("/").isRootPath()).toBe(true);
+            expect(new XPath("/country/@name").isRootPath()).toBe(false);
+        })
+
+        it("Should return XPath elements", () => {
+
+            function elements(xpath) {
+                const result = [];
+                const list = xpath.getElements();
+                for (const e of list) {
+                    result.push(e._pathElement);
+                }
+                return result;
+            }
+
+            expect(elements(new XPath(""))).toEqual([  ]);
+            expect(elements(new XPath(" "))).toEqual([  ]);
+            expect(elements(new XPath(null))).toEqual([  ]);
+            expect(elements(new XPath(undefined))).toEqual([  ]);
+            expect(elements(new XPath("@name"))).toEqual([ "@name" ]);
+            expect(elements(new XPath("country/@name"))).toEqual([ "country", "@name" ]);
+            expect(elements(new XPath(".."))).toEqual([ ".." ]);
+            expect(elements(new XPath("."))).toEqual([ "." ]);
+            expect(elements(new XPath("/"))).toEqual([  ]);
+            expect(elements(new XPath("/country/@name"))).toEqual([ "country", "@name" ]);
+        })
+
+        it("Should get relative path", () => {
+            expect(new XPath("").getRelativePath().asString()).toBe("");
+            expect(new XPath(" ").getRelativePath().asString()).toBe("");
+            expect(new XPath(null).getRelativePath().asString()).toBe("");
+            expect(new XPath(undefined).getRelativePath().asString()).toBe("");
+            expect(new XPath("@name").getRelativePath().asString()).toBe("@name");
+            expect(new XPath("country/@name").getRelativePath().asString()).toBe("country/@name");
+            expect(new XPath("..").getRelativePath().asString()).toBe("..");
+            expect(new XPath(".").getRelativePath().asString()).toBe(".");
+            expect(new XPath("/").getRelativePath().asString()).toBe("");
+            expect(new XPath("/country/@name").getRelativePath().asString()).toBe("country/@name");
+        })
+    });
+
+    describe("XPathElement", () => {
+        it("Should create XPathElement", () => {
+            expect(() => { new XPathElement(""); }).toThrow("Invalid empty xpath element");
+            expect(() => { new XPathElement(" "); }).toThrow("Invalid empty xpath element");
+            expect(() => { new XPathElement(null); }).toThrow("Invalid empty xpath element");
+            expect(() => { new XPathElement(undefined); }).toThrow("Invalid empty xpath element");
+            expect(new XPathElement("@name").asString()).toBe("@name");
+            expect(new XPathElement("country").asString()).toBe("country");
+            expect(new XPathElement("..").asString()).toBe("..");
+            expect(new XPathElement(".").asString()).toBe(".");
+        })
+
+        it("toString", () => {
+            expect(new XPathElement("@name").toString()).toBe("@name");
+            expect(new XPathElement("country").toString()).toBe("country");
+            expect(new XPathElement("..").toString()).toBe("..");
+            expect(new XPathElement(".").toString()).toBe(".");
+        })
+
+        it("Should test if path element is self", () => {
+            expect(new XPathElement("@name").isSelf()).toBe(false);
+            expect(new XPathElement("country").isSelf()).toBe(false);
+            expect(new XPathElement("..").isSelf()).toBe(false);
+            expect(new XPathElement(".").isSelf()).toBe(true);
+        })
+
+        it("Should test if path element is the parent path (..)", () => {
+            expect(new XPathElement("@name").isParent()).toBe(false);
+            expect(new XPathElement("country").isParent()).toBe(false);
+            expect(new XPathElement("..").isParent()).toBe(true);
+            expect(new XPathElement(".").isParent()).toBe(false);
+        })
+    })
 });

package/test/escape.test.js

@@ -18,65 +18,97 @@ governing permissions and limitations under the License.
  *********************************************************************************/
 const sdk = require('../src/index.js');
 
-describe('escapeXtk', function() {
-    
-    describe('Escaping strings', function() {
-        it("Should escape null strings", () => {
-            expect(sdk.escapeXtk(null)).toBe("''");
-        });
-
-        it("Should escape undefined strings", () => {
-            expect(sdk.escapeXtk(undefined)).toBe("''");
-        });
-
-        it("Should escape empty strings", () => {
-            expect(sdk.escapeXtk("")).toBe("''");
-        });
+describe('escaping', function() {
 
-        it("Should escape empty simple strings", () => {
-            expect(sdk.escapeXtk("Hello")).toBe("'Hello'");
-            expect(sdk.escapeXtk("Hello world")).toBe("'Hello world'");
-            expect(sdk.escapeXtk(" ")).toBe("' '");
-        });
+    describe('escapeXtk', function() {
+        
+        describe('Escaping strings', function() {
+            it("Should escape null strings", () => {
+                expect(sdk.escapeXtk(null)).toBe("''");
+            });
+
+            it("Should escape undefined strings", () => {
+                expect(sdk.escapeXtk(undefined)).toBe("''");
+            });
+
+            it("Should escape empty strings", () => {
+                expect(sdk.escapeXtk("")).toBe("''");
+            });
+
+            it("Should escape empty simple strings", () => {
+                expect(sdk.escapeXtk("Hello")).toBe("'Hello'");
+                expect(sdk.escapeXtk("Hello world")).toBe("'Hello world'");
+                expect(sdk.escapeXtk(" ")).toBe("' '");
+            });
+
+            it("Should escape simple quotes", () => {
+                expect(sdk.escapeXtk("Hello 'world'")).toBe("'Hello \\'world\\''");
+            });
+        })
 
-        it("Should escape simple quotes", () => {
-            expect(sdk.escapeXtk("Hello 'world'")).toBe("'Hello \\'world\\''");
-        });
-    })
+        describe('Tagged template litteral', function() {
 
-    describe('Tagged template litteral', function() {
+            it("Should escape in template litteral", () => {
+                expect(sdk.escapeXtk`Hello world`).toBe("Hello world");
+                expect(sdk.escapeXtk`Hello 'world'`).toBe("Hello 'world'");     // only variables are escaped
 
-        it("Should escape in template litteral", () => {
-            expect(sdk.escapeXtk`Hello world`).toBe("Hello world");
-            expect(sdk.escapeXtk`Hello 'world'`).toBe("Hello 'world'");     // only variables are escaped
+                const empty = "";
+                expect(sdk.escapeXtk``).toBe("");
+                expect(sdk.escapeXtk`${empty}`).toBe("''");
 
-            const empty = "";
-            expect(sdk.escapeXtk``).toBe("");
-            expect(sdk.escapeXtk`${empty}`).toBe("''");
+                const name = "Joe's";
+                expect(sdk.escapeXtk`Hello ${name}`).toBe("Hello 'Joe\\'s'");    // variable value is quoted and escaped
 
-            const name = "Joe's";
-            expect(sdk.escapeXtk`Hello ${name}`).toBe("Hello 'Joe\\'s'");    // variable value is quoted and escaped
+                // A more relevant test
+                const userName = 'Alex';
+                expect({ expr: sdk.escapeXtk`@name = ${userName}` }).toEqual({ expr: "@name = 'Alex'" });
 
-            // A more relevant test
-            const userName = 'Alex';
-            expect({ expr: sdk.escapeXtk`@name = ${userName}` }).toEqual({ expr: "@name = 'Alex'" });
+                // Should support multiple variables
+                expect({ expr: sdk.escapeXtk`@name = ${userName} or @name = ${name}` }).toEqual({ expr: "@name = 'Alex' or @name = 'Joe\\'s'" });
+            })
 
-            // Should support multiple variables
-            expect({ expr: sdk.escapeXtk`@name = ${userName} or @name = ${name}` }).toEqual({ expr: "@name = 'Alex' or @name = 'Joe\\'s'" });
+            it("Should support constants", () => {
+                expect(sdk.escapeXtk([],[])).toBe("''");
+            })
         })
 
-        it("Should support constants", () => {
-            expect(sdk.escapeXtk([],[])).toBe("''");
+        it("examples in jsdoc", () => {
+            expect(sdk.escapeXtk("Rock 'n' Roll")).toBe("'Rock \\'n\\' Roll'");
+            expect(sdk.escapeXtk`@name=${"Rock 'n' Roll"}`).toBe("@name='Rock \\'n\\' Roll'");
+        });
+
+        describe('QueryDef & template litteral', () => {
+            
         })
-    })
 
-    it("examples in jsdoc", () => {
-        expect(sdk.escapeXtk("Rock 'n' Roll")).toBe("'Rock \\'n\\' Roll'");
-        expect(sdk.escapeXtk`@name=${"Rock 'n' Roll"}`).toBe("@name='Rock \\'n\\' Roll'");
     });
 
-    describe('QueryDef & template litteral', () => {
-        
-    })
+    describe('escapeForLike', function() {
+        it('Should support null and undefined', () => {
+            expect(sdk.escapeForLike(null)).toBe('');
+            expect(sdk.escapeForLike(undefined)).toBe('');
+            expect(sdk.escapeForLike('')).toBe('');
+        });
+
+        it('Should escape simple strings', () => {
+            expect(sdk.escapeForLike('Hello')).toBe('Hello');
+            expect(sdk.escapeForLike('Hello world')).toBe('Hello world');
+            expect(sdk.escapeForLike('1234')).toBe('1234');
+        });
+
+        it('Should escape special chars', () => {
+            expect(sdk.escapeForLike('99.9%')).toBe('99.9\\%');
+            expect(sdk.escapeForLike("John 'Rusty' Toe")).toBe("John \\'Rusty\\' Toe");
+            expect(sdk.escapeForLike("Hello_Cruel_World")).toBe("Hello\\_Cruel\\_World");
+            expect(sdk.escapeForLike("John \\Rusty\\ Toe")).toBe("John \\\\Rusty\\\\ Toe");
+            // $ is not a special char
+            expect(sdk.escapeForLike('$99.9')).toBe('$99.9');
+        });
+
+        it('Should escape Xtk Variables', () => {
+            expect(sdk.escapeForLike('$99.9', false)).toBe('$99.9');
+            expect(sdk.escapeForLike('1+$id', true)).toBe("1+' + Char('36') + 'id");
+        });
+    });
 
-});
+});

package/test/index.test.js

@@ -73,6 +73,74 @@ describe('ACC SDK', function() {
                 sdk._transport(old);
             }
         });
-    })
+    });
+
+    describe("expandXPath", () => {
+        it("Should support empty paths", () => {
+            expect(sdk.expandXPath(null)).toBe(null);
+            expect(sdk.expandXPath(undefined)).toBe(undefined);
+            expect(sdk.expandXPath("")).toBe("");
+        });
+
+        it("Should preserve already expanded xpath", () => {
+            expect(sdk.expandXPath("[@email]")).toBe("[@email]");
+            expect(sdk.expandXPath("[@recipient-id]")).toBe("[@recipient-id]");
+            expect(sdk.expandXPath("[recipient/@id]")).toBe("[recipient/@id]");
+        });
+
+        it("Should not add brackets if not necessary", () => {
+            expect(sdk.expandXPath("@email")).toBe("@email");
+            expect(sdk.expandXPath("@email_address")).toBe("@email_address");
+        });
+
+        it("Should add brackets if necessary", () => {
+            expect(sdk.expandXPath("@recipient-id")).toBe("[@recipient-id]");
+            expect(sdk.expandXPath("email/@address")).toBe("[email/@address]");
+            expect(sdk.expandXPath("nms:recipient")).toBe("[nms:recipient]");
+        });
+    });
+
+    describe("unexpandXPath", () => {
+        it("Should support empty paths", () => {
+            expect(sdk.unexpandXPath(null)).toBe(null);
+            expect(sdk.unexpandXPath(undefined)).toBe(undefined);
+            expect(sdk.unexpandXPath("")).toBe("");
+        });
+
+        it("Should remove brackets", () => {
+            expect(sdk.unexpandXPath("[@email]")).toBe("@email");
+            expect(sdk.unexpandXPath("[@recipient-id]")).toBe("@recipient-id");
+            expect(sdk.unexpandXPath("[recipient/@id]")).toBe("recipient/@id");
+        });
+
+        it("Should preseve already unexpanded pathx", () => {
+            expect(sdk.unexpandXPath("@email")).toBe("@email");
+            expect(sdk.unexpandXPath("@email_address")).toBe("@email_address");
+        });
+
+        it("Should support array-paths", () => {
+            expect(sdk.unexpandXPath("coll[0]")).toBe("coll[0]");
+            expect(sdk.unexpandXPath("[coll[0]]")).toBe("coll[0]");
+        });
+    });
+    
+    describe("xtkConstText", () => {
+        it("Should handle various types", () => {
+            // Strings are quoted and escaped
+            expect(sdk.xtkConstText("Hello", "string")).toBe("'Hello'");
+            expect(sdk.xtkConstText("", "string")).toBe("''");
+            expect(sdk.xtkConstText(123, "string")).toBe("'123'");
+            expect(sdk.xtkConstText("Hello'World", "memo")).toBe("'Hello\\'World'");
+            // Numbers are unchanged
+            expect(sdk.xtkConstText(123, "long")).toBe("123");
+            expect(sdk.xtkConstText(-42.3, "double")).toBe("-42.3");
+            expect(sdk.xtkConstText("", "long")).toBe("0");
+            expect(sdk.xtkConstText(undefined, "short")).toBe("0");
+            // Timestamps are surrounded by ##
+            expect(sdk.xtkConstText("2022-02-15T09:49:04.000Z", "datetime")).toBe("#2022-02-15T09:49:04.000Z#");
+            expect(sdk.xtkConstText("", "datetime")).toBe("##");
+            expect(sdk.xtkConstText(undefined, "date")).toBe("##");
+        });
+    });
 
 });

package/test/mock.js

@@ -17,6 +17,17 @@ governing permissions and limitations under the License.
  * 
  *********************************************************************************/
  const sdk = require('../src/index.js');
+ const crypto = require("crypto");
+
+ const makeKey = () => {
+    const a = [];
+    for (let i=0; i<32; i++) {
+        a.push(Math.floor(crypto.randomInt(0, 256))); 
+    }
+    const buffer = Buffer.from(a);
+    const s = buffer.toString('base64');
+    return s;
+ }
 
  async function makeAnonymousClient(options) {
     const connectionParameters = sdk.ConnectionParameters.ofAnonymousUser("http://acc-sdk:8080", options);
@@ -63,7 +74,7 @@ const LOGON_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:xtk:session' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
         <LogonResponse xmlns='urn:xtk:session' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
-            <pstrSessionToken xsi:type='xsd:string'>___C8B4A541-48DC-4C97-95AD-066930FD3892</pstrSessionToken>
+            <pstrSessionToken xsi:type='xsd:string'>___$session_token$</pstrSessionToken>
             <pSessionInfo xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
             <sessionInfo>
                 <serverInfo advisedClientBuildNumber="0" allowSQL="false" buildNumber="9219" commitId="f5f3ec3" databaseId="uFE80000000000000F1FA913DD7CC7C480041161C" defaultNameSpace="cus" fohVersion="2" instanceName="ffdamkt" majNumber="6" minClientBuildNumber="8969" minNumber="7" minNumberTechnical="0" releaseName="20.3" securityTimeOut="86400" serverDate="2020-07-05 14:11:31.986Z" servicePack="0" sessionTimeOut="86400" useVault="false"/>
@@ -75,11 +86,32 @@ const LOGON_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
                     </userInfo>
                 </sessionInfo>
             </pSessionInfo>
-            <pstrSecurityToken xsi:type='xsd:string'>@mMBSMLXIpQd56agsZ5X7OGXWz8Q476qMq6FimwqCdT1wByRDq3pQtaYSY4uJnAbCgXIvpXA5TrxHu-3YjUad5g==</pstrSecurityToken>
+            <pstrSecurityToken xsi:type='xsd:string'>@$security_token$==</pstrSecurityToken>
         </LogonResponse>
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
 
+    const BEARER_LOGON_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:xtk:session' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+    <SOAP-ENV:Body>
+        <BearerTokenLogonResponse xmlns='urn:xtk:session' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+            <pstrSessionToken xsi:type='xsd:string'>___$session_token$</pstrSessionToken>
+            <pSessionInfo xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+            <sessionInfo>
+                <serverInfo advisedClientBuildNumber="0" allowSQL="false" buildNumber="9219" commitId="f5f3ec3" databaseId="uFE80000000000000F1FA913DD7CC7C480041161C" defaultNameSpace="cus" fohVersion="2" instanceName="ffdamkt" majNumber="6" minClientBuildNumber="8969" minNumber="7" minNumberTechnical="0" releaseName="20.3" securityTimeOut="86400" serverDate="2020-07-05 14:11:31.986Z" servicePack="0" sessionTimeOut="86400" useVault="false"/>
+                    <userInfo datakitInDatabase="true" homeDir="" instanceLocale="en" locale="en" login="admin" loginCS="Administrator (admin)" loginId="1059" noConsoleCnx="false" orgUnitId="0" theme="" timezone="Europe/Paris">
+                        <login-group id="1060"/>
+                        <login-right right="admin"/>
+                        <installed-package name="campaign" namespace="nms"/>
+                        <installed-package name="core" namespace="nms"/>
+                    </userInfo>
+                </sessionInfo>
+            </pSessionInfo>
+            <pstrSecurityToken xsi:type='xsd:string'>@$security_token$==</pstrSecurityToken>
+        </BearerTokenLogonResponse>
+    </SOAP-ENV:Body>
+    </SOAP-ENV:Envelope>`);
+
 const LOGON_RESPONSE_NO_USERINFO = 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:session' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
@@ -198,7 +230,17 @@ const GET_XTK_SESSION_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
                     </method>
                     <method name="NonStatic"></method>
                     <method name="TestCnx" static="true"></method>
-                    </methods>
+                    <method name="NonStaticP1">
+                        <parameters>
+                            <param name="name" type="string"/>
+                        </parameters>
+                    </method>
+                    <method name="StaticP1" static="true">
+                        <parameters>
+                            <param name="name" type="string"/>
+                        </parameters>
+                    </method>
+                </methods>
             </schema>
             </pdomDoc>
         </GetEntityIfMoreRecentResponse>
@@ -259,37 +301,43 @@ const GET_XTK_QUERY_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
 
-const GET_MID_EXT_ACCOUNT_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
+const GET_MID_EXT_ACCOUNT_RESPONSE = (encryptedPassword) => {
+    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:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
         <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
             <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
-                <extAccount account="mid" id="2088" name="defaultEmailMid" password="@57QS5VHMb9BCsojLVrKI/Q==" server="http://ffdamid:8080" type="3"/>
+                <extAccount account="mid" id="2088" name="defaultEmailMid" password="${encryptedPassword}" server="http://ffdamid:8080" type="3"/>
             </pdomOutput>
         </ExecuteQueryResponse>
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
+}
 
-const GET_BAD_EXT_ACCOUNT_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
+const GET_BAD_EXT_ACCOUNT_RESPONSE = (encryptedPassword) => {
+    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:queryDef' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
         <ExecuteQueryResponse xmlns='urn:xtk:queryDef' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
             <pdomOutput xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
-                <extAccount account="bad" id="2088" name="bad" password="@57QS5VHMb9BCsojLVrKI/Q==" server="http://zz:8080" type="999"/>
+                <extAccount account="bad" id="2088" name="bad" password="${encryptedPassword}" server="http://zz:8080" type="999"/>
             </pdomOutput>
         </ExecuteQueryResponse>
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
+}
 
-const GET_SECRET_KEY_OPTION_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
+const GET_SECRET_KEY_OPTION_RESPONSE = (key) => {
+    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:session' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
         <GetOptionResponse xmlns='urn:xtk:session' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
-            <pstrValue xsi:type='xsd:string'>HMLmn6uvWr8wu1Akt8UORr07YbC64u1FVW7ENAxNjpo=</pstrValue>
+            <pstrValue xsi:type='xsd:string'>${key}</pstrValue>
             <pbtType xsi:type='xsd:byte'>6</pbtType>
         </GetOptionResponse>
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
+}
 
 const GET_LOGON_MID_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:xtk:session' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
@@ -573,11 +621,13 @@ exports.Mock = {
   makeClient: makeClient,
   makeAnonymousClient: makeAnonymousClient,
   withMockConsole: withMockConsole,
+  makeKey: makeKey,
   R_TEST: R_TEST,
   PING: PING,
   MC_PING: MC_PING,
   MC_PING_ERROR: MC_PING_ERROR,
   LOGON_RESPONSE: LOGON_RESPONSE,
+  BEARER_LOGON_RESPONSE: BEARER_LOGON_RESPONSE,
   LOGON_RESPONSE_NO_SESSIONTOKEN: LOGON_RESPONSE_NO_SESSIONTOKEN,
   LOGON_RESPONSE_NO_SECURITYTOKEN: LOGON_RESPONSE_NO_SECURITYTOKEN,
   LOGOFF_RESPONSE: LOGOFF_RESPONSE,

package/test/soap.test.js

@@ -154,11 +154,8 @@ describe('SOAP', function() {
             const env = DomUtil.parse(request.data).documentElement;
             const header = hasChildElement(env, "SOAP-ENV:Header");
             expect(DomUtil.findElement(header, "Cookie")).toBeFalsy();
-            hasChildElement(header, "X-Security-Token");
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Empty", undefined, "xmlns:m", "urn:xtk:session", "SOAP-ENV:encodingStyle", "http://schemas.xmlsoap.org/soap/encoding/");
-            // sessiontoken is always required as first parameter, even if not set
-            expect(DomUtil.findElement(method, "sessiontoken")).toBeTruthy();
         });
 
         it('Should have set authentication tokens', function() {
@@ -168,11 +165,8 @@ describe('SOAP', function() {
             assert.equal(request.headers["Cookie"], "__sessiontoken=$session$", "Session token matches");
             const env = DomUtil.parse(request.data).documentElement;
             const header = hasChildElement(env, "SOAP-ENV:Header");
-            hasChildElement(header, "Cookie", "__sessiontoken=$session$");
-            hasChildElement(header, "X-Security-Token", "$security$");
             const body = hasChildElement(env, "SOAP-ENV:Body");
             const method = hasChildElement(body, "m:Empty");
-            hasChildElement(method, "sessiontoken", "$session$", "xsi:type", "xsd:string");
         });
 
         it('Should set boolean parameters', function() {