@adobe/acc-js-sdk 1.1.40 → 1.1.42

package/package.json

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

package/src/client.js

@@ -2013,7 +2013,10 @@ class Client {
         const inputParams = [];
         const outputParams = [];
 
-        // For non static methods, the first input and the first output parameters represent the entity itself. The name of the corresponding
+        // For non static methods 
+        //   in case of persistent job: object represents the entity instance
+        //   in case of non-persistent job: object represents job description 
+        // the first output parameters represent the entity itself. The name of the corresponding
         // parameter is set the the entity schema name.
         if (!isStatic) {
             var schemaName = entitySchemaId.substring(entitySchemaId.indexOf(':') + 1);

package/src/xtkJob.js

@@ -160,23 +160,42 @@ class XtkJobInterface {
         var schema = await this._client.getSchema(entitySchemaId, "xml", true);
         if (!schema)
             throw CampaignException.SOAP_UNKNOWN_METHOD(entitySchemaId, methodName, `Schema '${entitySchemaId}' not found`);
-        var method = this._client._methodCache.get(entitySchemaId, methodName);
+        var method = await this._client._methodCache.get(entitySchemaId, methodName);
         if (!method)
             throw CampaignException.SOAP_UNKNOWN_METHOD(entitySchemaId, methodName, `Method '${methodName}' of schema '${entitySchemaId}' not found`);
-        // SubmitSoapCall does not support 
+
         const isStatic = DomUtil.getAttributeAsBoolean(method, "static");
-        if (isStatic) 
-            throw CampaignException.SOAP_UNKNOWN_METHOD(entitySchemaId, methodName, `Method '${methodName}' of schema '${entitySchemaId}' is static`);
-
-
-        var jobId = await callContext.client._callMethod("SubmitSoapCall", callContext, [ {
-            name: this._soapCall.method,
-            service: this._soapCall.xtkschema,
-            param: [
-                { name:"this", type:"DOMDocument", value: this._soapCall.object },
-                { name:"bStart", type:"boolean", value:"false" },
-            ]
-        } ]);
+
+        var jobId = null;
+        if ( !isStatic)
+            jobId = await callContext.client._callMethod("SubmitSoapCall", callContext, [ {
+                name: this._soapCall.method,
+                service: this._soapCall.xtkschema,
+                param: [
+                    { name:"this", type:"DOMDocument", value: this._soapCall.object },
+                    { name:"bStart", type:"boolean", value:"false" },
+                ]
+            } ]);
+        else {
+            // for non-persistant job, override object to intialize job properties
+            callContext.object = {
+                doNotPersist: "true",
+                xtkschema: this._soapCall.xtkschema,
+                id: this._soapCall.jobId,
+                properties: {
+                    warning: false,
+                }
+            };
+            // SubmitSoapCall now supports static method
+            // no need parameter type as it's already present in API definition
+            jobId = await callContext.client._callMethod("SubmitSoapCall", callContext,
+                    {                
+                        name: this._soapCall.method,
+                        service: this._soapCall.xtkschema,
+                        param : this._soapCall.args
+                    },
+             );
+        }
         this.jobId = jobId;
         return jobId;
     }

package/test/client.test.js

@@ -3913,6 +3913,55 @@ describe('ACC Client', function () {
             });
         });
 
+        it("Should support 'className' 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", className: "myClass" });
+
+            const body = global.document.body;
+            const iframes = body.getElementsByTagName("iframe");
+            let found = false;
+            for (let i=0; i<iframes.length; i++) {
+                const iframe = iframes[i];
+                if (iframe.className === "myClass")
+                    found = true;
+            }
+            expect(found).toBe(true);
+        });
+
         it("Should support 'none' action", async () => {
             // Create a mock client and logon
             const client = await Mock.makeClient();

package/test/xtkJob.test.js

@@ -325,6 +325,48 @@ describe('XRK Jobs', function () {
             } ]);
         });
 
+        it("SubmitSoapCall a non-persistant and static job with success", async () => {
+            const client = { _callMethod: jest.fn(), getSchema: jest.fn(), _methodCache: { get: jest.fn()} };
+            const jobDescription = { 
+                doNotPersist: "true",
+                xtkschema: 'nms:webApp',
+                id: "9876",
+                properties: {
+                    warning: false,
+                }};
+            const soapCallArgs =  [
+                {
+                  where: {
+                    condition: {
+                      expr: "@id=9876"
+                    }
+                  }
+                },
+                {
+                  type: "byte",
+                  value: "10"
+                }
+              ]
+            const job = new XtkJobInterface(client, { xtkschema: "nms:webApp", jobId: "9876", method: "Publish", args: soapCallArgs });
+            client._callMethod.mockReturnValueOnce(Promise.resolve("9876"));
+            client.getSchema.mockReturnValueOnce(Promise.resolve(true));
+            client._methodCache.get.mockReturnValueOnce(DomUtil.parse('<method static="true"></method>').documentElement);
+            const jobId = await job.submitSoapCall();
+            expect(jobId).toBe("9876");
+            expect(client._callMethod.mock.calls.length).toBe(1);
+            expect(client._callMethod.mock.calls[0][0]).toBe("SubmitSoapCall");
+            expect(client._callMethod.mock.calls[0][1]).toMatchObject({
+                entitySchemaId: "nms:webApp",
+                schemaId: "xtk:jobInterface",
+                object: jobDescription,
+            });
+            expect(client._callMethod.mock.calls[0][2]).toEqual({                
+                name: "Publish",
+                service: "nms:webApp",
+                param : soapCallArgs
+            });
+        });
+
         it("Infer schema from objects", async () => {
             const client = { _callMethod: jest.fn(), getSchema: jest.fn(), _methodCache: { get: jest.fn()} };
             const job = new XtkJobInterface(client, { object: { xtkschema: "nms:delivery", name: "Hello World" }, method: "Prepare" });
@@ -390,23 +432,6 @@ describe('XRK Jobs', function () {
                 "statusCode": 400,
             });
         });
-
-        it("Should fail on static methods", async () => {
-            const client = { _callMethod: jest.fn(), getSchema: jest.fn(), _methodCache: { get: jest.fn()} };
-            const job = new XtkJobInterface(client, { object: { xtkschema: "nms:delivery", name: "Hello World" }, method: "StaticMethod" });
-            client._callMethod.mockReturnValueOnce(Promise.resolve("9876"));
-            client.getSchema.mockReturnValueOnce(Promise.resolve(true));
-            client._methodCache.get.mockReturnValueOnce(DomUtil.parse('<method static="true"></method>').documentElement);
-            await expect(job.submitSoapCall()).rejects.toMatchObject({
-                "detail": "Method 'StaticMethod' of schema 'nms:delivery' is static",
-                "errorCode": "SDK-000009",
-                "faultCode": 16384,
-                "faultString": "Unknown method 'StaticMethod' of schema 'nms:delivery'",
-                "message": "400 - Error 16384: SDK-000009 Unknown method 'StaticMethod' of schema 'nms:delivery'. Method 'StaticMethod' of schema 'nms:delivery' is static",
-                "name": "CampaignException",
-                "statusCode": 400,
-            });
-        });
     });
 
     describe("Get Status", () => {