@adobe/acc-js-sdk 1.1.51 → 1.1.53

package/docs/changeLog.html

@@ -2,6 +2,23 @@
 layout: page
 title: Change Log
 ---
+<section class="changelog"><h1>Version 1.1.53</h1>
+  <h2>2024/09/06</h2>
+  <li>
+    Fixed JSON/XML serialization when there is both an attribute and an element with the same name
+  </li>
+</section>
+
+<section class="changelog"><h1>Version 1.1.52</h1>
+  <h2>2024/09/04</h2>
+  <li>
+    Updated dependencies to fix vulnerabilities reported by npm
+  </li>
+  <li>
+    Report upload error correctly when file upload fails
+  </li>
+</section>
+
 <section class="changelog"><h1>Version 1.1.51</h1>
   <h2>2024/08/15</h2>
   <li>

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.51",
+      "version": "1.1.53",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.2.1",
@@ -3668,11 +3668,12 @@
       "license": "MIT"
     },
     "node_modules/micromatch": {
-      "version": "4.0.5",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       },
       "engines": {
@@ -7152,10 +7153,12 @@
       "dev": true
     },
     "micromatch": {
-      "version": "4.0.5",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dev": true,
       "requires": {
-        "braces": "^3.0.2",
+        "braces": "^3.0.3",
         "picomatch": "^2.3.1"
       }
     },

package/package.json

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

package/src/client.js

@@ -629,22 +629,37 @@ const fileUploader = (client) => {
                                     size: file.size,
                                 };
                                 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'
-
+                                  try {
+                                    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();
+                                    await client.NLWS.xtkFileRes
+                                      .create(fileRes)
+                                      .publishIfNeeded();
+                                    const url = await client.NLWS.xtkFileRes
+                                      .create(fileRes)
+                                      .getURL();
                                     result.url = url;
+                                  } catch (ex) {
+                                    reject(
+                                      CampaignException.FILE_UPLOAD_FAILED(
+                                        file.name,
+                                        ex
+                                      )
+                                    );
+                                  }
                                 }
                                 resolve(result);
                             }

package/src/domUtil.js

@@ -314,7 +314,7 @@ class DomUtil {
             var attFirstIndex = 1;
 
             if (flavor == "SimpleJson") {
-                if ((t == "string" || t == "number" || t == "boolean") && att[0] != '$') {
+                if ((t == "string" || t == "number" || t == "boolean") && att[0] != '$' && att[0] != '@') {
                     isAtt = true;
                     attFirstIndex = 0;
                 }

package/test/client.test.js

@@ -4061,6 +4061,67 @@ describe('ACC Client', function () {
                 expect(found).toBe(true);
             });
 
+            it("Should throw error when 'publishIfNeeded' action rejected", 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.reject(`Some error occured`)
+              ); // xtk:fileRes#PublishIfNeeded
+
+              client._transport.mockReturnValueOnce(
+                Promise.resolve(Mock.GET_URL_RESPONSE)
+              ); // xtk:fileRes#GetURL
+
+              await client.fileUploader
+                .upload({
+                  type: "text/html",
+                  size: 12345,
+                  name: "abcd.txt",
+                })
+                .catch((ex) => {
+                  expect(ex.message).toMatch(
+                    "500 - Error 16384: SDK-000013 \"Failed to upload file abcd.txt. 500 - Error calling method 'xtk:fileRes#PublishIfNeeded': Some error occured"
+                  );
+                });
+            });
+
             it("Should support 'none' action", async () => {
                 // Create a mock client and logon
                 const client = await Mock.makeClient();

package/test/domUtil.test.js

@@ -156,6 +156,8 @@ describe('DomUtil', function() {
             assert.strictEqual(fromJSON({ "a": [ ] }), '<root/>');
             assert.strictEqual(fromJSON({ "a": null }), '<root/>');
             assert.strictEqual(fromJSON({ "a": undefined }), '<root/>');
+            assert.strictEqual(fromJSON({ "@a":2, "@b":"zz", "@c": true }), '<root a="2" b="zz" c="true"/>');
+            assert.strictEqual(fromJSON({ "a":{ x:3 }, "@a": 2 }), '<root a="2"><a x="3"/></root>');
         });
 
         it("Should support attributes named 'length'", () => {
@@ -192,6 +194,8 @@ describe('DomUtil', function() {
             assert.strictEqual(fromJSON({ "a": [ ] }), '<root/>');
             assert.strictEqual(fromJSON({ "a": null }), '<root/>');
             assert.strictEqual(fromJSON({ "a": undefined }), '<root/>');
+            assert.strictEqual(fromJSON({ "@a":2, "@b":"zz", "@c": true }), '<root a="2" b="zz" c="true"/>');
+            assert.strictEqual(fromJSON({ "a":{ x:3 }, "@a": 2 }), '<root a="2"><a x="3"/></root>');
         });
     });