@adobe/acc-js-sdk 1.1.35 → 1.1.37

package/docs/changeLog.html

@@ -3,6 +3,20 @@ layout: page
 title: Change Log
 ---
 
+<section class="changelog"><h1>Version 1.1.37</h1>
+  <h2>2023/08/07</h2>
+  <li>
+    Fix missing schema localisation for description id when description is empty in the source schema
+  </li>
+</section>
+
+<section class="changelog"><h1>Version 1.1.36</h1>
+  <h2>2023/07/28</h2>
+  <li>
+    Fixed the `uploadAemAsset` method when used from a browser, using fetch for HTTP requests.
+  </li>
+</section>
+
 <section class="changelog"><h1>Version 1.1.35</h1>
   <h2>2023/07/25</h2>
   <li>

package/package-lock.json

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

package/package.json

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

package/src/application.js

@@ -62,7 +62,10 @@ function propagateImplicitValues(xtkDesc, labelOnly) {
         // Force first letter as uppercase
         xtkDesc.label = xtkDesc.label.substring(0, 1).toUpperCase() + xtkDesc.label.substring(1);
     }
-    if (!labelOnly && !xtkDesc.description) xtkDesc.description = xtkDesc.label;
+    if (!labelOnly && !xtkDesc.description) {
+        xtkDesc.description = xtkDesc.label;
+        xtkDesc.descriptionLocalizationId = xtkDesc.labelLocalizationId;
+    }
 }
 
 // ========================================================================================

package/src/client.js

@@ -657,13 +657,22 @@ const fileUploader = (client) => {
                 if(headers['Authorization'] === undefined || headers['Authorization'] === '' || headers['Authorization'] === 'null') {
                     throw 'Bearer token is missing';
                 }
+                // Serialize json data (required for fetch)
+                const jsonData = JSON.stringify({
+                    'assetDownloadUrl': assetDownloadUrl
+                });
 
-                const response = await client._makeHttpCall({
+                var response = await client._makeHttpCall({
                     url: url,
                     method: 'POST',
-                    data: {assetDownloadUrl: assetDownloadUrl},
+                    data: jsonData,
                     headers: headers
                 });
+
+                // response is returned as string when using fetch(in browser)
+                // & returned as json using axios(nodejs).
+                if(typeof response === 'string')
+                  response = JSON.parse(response);
                 if(response.publishedURL)
                   return response;
                 else

package/test/application.test.js

@@ -2400,7 +2400,15 @@ describe('Application', () => {
             expect(root.labelLocalizationId).toBe('nms__recipient__e____recipient__@label');
             expect(root.descriptionLocalizationId).toBe('nms__recipient__e____recipient__@desc');
           });
-
+            
+          it("root node should have the label localization id when label exist but description does not exist", () => {
+            const xml = DomUtil.parse("<schema namespace='nms' name='recipient'><element name='recipient' label='Recipients' /></schema>");
+            const schema = newSchema(xml);
+            const root = schema.root;
+            expect(root.labelLocalizationId).toBe('nms__recipient__e____recipient__@label');
+            expect(root.descriptionLocalizationId).toBe('nms__recipient__e____recipient__@label');
+          });
+            
           it("child node should have a correct label localization id", () => {
             const xml = DomUtil.parse("<schema namespace='nms' name='recipient'><element name='lib' label='library' desc='library'/><element name='recipient' label='Recipients'/></schema>");
             const schema = newSchema(xml);

package/test/client.test.js

@@ -1756,11 +1756,11 @@ describe('ACC Client', function () {
             await client.NLWS.xtkSession.logon();
 
             const mockResponse = {
-                "publishedURL" : "http://trk-inst-xyz.campaign.adobe.com/res/trk-inst/409afb8798180a36591456e152b6c406.jpeg"
+                "publishedURL" : "http://trk-inst-xyz.camp.adobe.com/res/trk-inst/409afb8798180a36591456e152b6c406.jpeg"
             };
             client._bearerToken = 'Bearer 1234567890';
             client._transport.mockReturnValueOnce(mockResponse);
-            const response = await client.fileUploader.uploadAemAsset("https://author-p74953-e183988-cmstg.adobeaemcloud.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download");
+            const response = await client.fileUploader.uploadAemAsset("https://author-stg.aem.adobe.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download");
             expect(response).toBe(mockResponse);
 
             client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
@@ -1773,7 +1773,7 @@ describe('ACC Client', function () {
             client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
             await client.NLWS.xtkSession.logon();
 
-            await (client.fileUploader.uploadAemAsset("https://author-p74953-e183988-cmstg.adobeaemcloud.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download"))
+            await (client.fileUploader.uploadAemAsset("https://author-stg.aem.adobe.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download"))
                   .catch( e => { expect(e).toMatchObject(CampaignException.AEM_ASSET_UPLOAD_FAILED('Bearer token is missing'))});
 
             client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
@@ -1791,7 +1791,7 @@ describe('ACC Client', function () {
             client._transport.mockReturnValueOnce(mockResponse);
             client._bearerToken = 'Bearer 1234567890';
 
-            await (client.fileUploader.uploadAemAsset("https://author-p74953-e183988-cmstg.adobeaemcloud.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download"))
+            await (client.fileUploader.uploadAemAsset("https://author-stg.aem.adobe.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download"))
                   .catch( e => { console.log(e); expect(e).toMatchObject(CampaignException.AEM_ASSET_UPLOAD_FAILED('Publishing failed'))});
 
             client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
@@ -1814,13 +1814,32 @@ describe('ACC Client', function () {
               client._bearerToken = 'Bearer 1234567890';
 
             var ex = CampaignException.AEM_ASSET_UPLOAD_FAILED('The requested content does not exist', 400);
-            await (client.fileUploader.uploadAemAsset("https://author-p74953-e183988-cmstg.adobeaemcloud.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download"))
+            await (client.fileUploader.uploadAemAsset("https://author-stg.aem.adobe.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download"))
                     .catch( e => { console.log(e); expect(e).toMatchObject(ex)});
 
             client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
             await client.NLWS.xtkSession.logoff();
         });
 
+        // Case 5: transport layer returns response as string instead of json when sdk
+        // used as package inside browser(Fetch API is used in browser while axios in node).
+        it("Should return correct response", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            const mockResponse = {
+                "publishedURL" : "http://trk-inst-xyz.camp.adobe.com/res/trk-inst/409afb8798180a36591456e152b6c406.jpeg"
+            };
+            const mockResponseString = JSON.stringify(mockResponse);
+            client._bearerToken = 'Bearer 1234567890';
+            client._transport.mockReturnValueOnce(mockResponseString);
+            const response = await client.fileUploader.uploadAemAsset("https://author-stg.aem.adobe.com/adobe/repository/content/dam/projects/children-kids-group-eating-ice-cream-funny-party-72701973%20%281%29%20%2812%29%20%282%29%20%283%29.jpg;api=block_download");
+            expect(response).toMatchObject(mockResponse);
+
+            client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
+            await client.NLWS.xtkSession.logoff();
+        });
     });