backendless 7.3.0 → 7.3.2

package/es/automations/index.js

@@ -133,7 +133,8 @@ var Automations = /*#__PURE__*/function () {
   }, {
     key: "activateFlowTriggerById",
     value: function () {
-      var _activateFlowTriggerById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flowId, triggerId, data) {
+      var _activateFlowTriggerById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flowId, triggerId, data, executionId) {
+        var query;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -155,17 +156,28 @@ var Automations = /*#__PURE__*/function () {
               }
               throw new Error('The "data" argument must be an object.');
             case 6:
+              if (!(executionId !== undefined && (typeof executionId !== 'string' || !executionId))) {
+                _context4.next = 8;
+                break;
+              }
+              throw new Error('The "executionId" argument must be a non-empty string.');
+            case 8:
+              query = {};
+              if (executionId) {
+                query.executionId = executionId;
+              }
               return _context4.abrupt("return", this.app.request.post({
                 url: "".concat(this.app.urls.automationFlow(), "/").concat(flowId, "/trigger/").concat(triggerId, "/activate"),
-                data: data || {}
+                data: data || {},
+                query: query
               }));
-            case 7:
+            case 11:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function activateFlowTriggerById(_x8, _x9, _x10) {
+      function activateFlowTriggerById(_x8, _x9, _x10, _x11) {
         return _activateFlowTriggerById.apply(this, arguments);
       }
       return activateFlowTriggerById;

package/es/index.js

@@ -21,6 +21,7 @@ var DEFAULT_PROPS = {
   appId: null,
   apiKey: null,
   serverURL: 'https://api.backendless.com',
+  automationServerURL: null,
   domain: null,
   apiURI: '/api',
   debugMode: false,
@@ -235,8 +236,18 @@ var Backendless = /*#__PURE__*/function () {
     get: function get() {
       return this.__serverURL;
     },
-    set: function set(serverURL) {
-      this.__serverURL = serverURL;
+    set: function set(url) {
+      this.__serverURL = url;
+    }
+
+    ///--------automationServerURL-------///
+  }, {
+    key: "automationServerURL",
+    get: function get() {
+      return this.__automationServerURL;
+    },
+    set: function set(url) {
+      this.__automationServerURL = url;
     }
 
     ///--------domain-------///
@@ -271,6 +282,17 @@ var Backendless = /*#__PURE__*/function () {
     set: function set(appPath) {
       throw new Error("Setting '".concat(appPath, "' value to Backendless.appPath directly is not possible, ") + 'instead you must use Backendless.initApp(APP_ID, API_KEY) for setup the value');
     }
+  }, {
+    key: "automationPath",
+    get: function get() {
+      if (!this.automationServerURL) {
+        return this.appPath;
+      }
+      return [this.automationServerURL, this.appId, this.apiKey].join('/');
+    },
+    set: function set(automationPath) {
+      throw new Error("Setting '".concat(automationPath, "' value to Backendless.automationPath directly is not possible"));
+    }
 
     ///--------debugMode-------///
   }, {

package/es/urls.js

@@ -22,7 +22,7 @@ var Urls = /*#__PURE__*/function () {
   }, {
     key: "automation",
     value: function automation() {
-      return "".concat(this.root(), "/automation");
+      return "".concat(this.app.automationPath, "/automation");
     }
   }, {
     key: "automationFlow",

package/lib/automations/index.js

@@ -133,7 +133,8 @@ var Automations = /*#__PURE__*/function () {
   }, {
     key: "activateFlowTriggerById",
     value: function () {
-      var _activateFlowTriggerById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flowId, triggerId, data) {
+      var _activateFlowTriggerById = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(flowId, triggerId, data, executionId) {
+        var query;
         return _regenerator["default"].wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -155,17 +156,28 @@ var Automations = /*#__PURE__*/function () {
               }
               throw new Error('The "data" argument must be an object.');
             case 6:
+              if (!(executionId !== undefined && (typeof executionId !== 'string' || !executionId))) {
+                _context4.next = 8;
+                break;
+              }
+              throw new Error('The "executionId" argument must be a non-empty string.');
+            case 8:
+              query = {};
+              if (executionId) {
+                query.executionId = executionId;
+              }
               return _context4.abrupt("return", this.app.request.post({
                 url: "".concat(this.app.urls.automationFlow(), "/").concat(flowId, "/trigger/").concat(triggerId, "/activate"),
-                data: data || {}
+                data: data || {},
+                query: query
               }));
-            case 7:
+            case 11:
             case "end":
               return _context4.stop();
           }
         }, _callee4, this);
       }));
-      function activateFlowTriggerById(_x8, _x9, _x10) {
+      function activateFlowTriggerById(_x8, _x9, _x10, _x11) {
         return _activateFlowTriggerById.apply(this, arguments);
       }
       return activateFlowTriggerById;

package/lib/index.js

@@ -21,6 +21,7 @@ var DEFAULT_PROPS = {
   appId: null,
   apiKey: null,
   serverURL: 'https://api.backendless.com',
+  automationServerURL: null,
   domain: null,
   apiURI: '/api',
   debugMode: false,
@@ -235,8 +236,18 @@ var Backendless = /*#__PURE__*/function () {
     get: function get() {
       return this.__serverURL;
     },
-    set: function set(serverURL) {
-      this.__serverURL = serverURL;
+    set: function set(url) {
+      this.__serverURL = url;
+    }
+
+    ///--------automationServerURL-------///
+  }, {
+    key: "automationServerURL",
+    get: function get() {
+      return this.__automationServerURL;
+    },
+    set: function set(url) {
+      this.__automationServerURL = url;
     }
 
     ///--------domain-------///
@@ -271,6 +282,17 @@ var Backendless = /*#__PURE__*/function () {
     set: function set(appPath) {
       throw new Error("Setting '".concat(appPath, "' value to Backendless.appPath directly is not possible, ") + 'instead you must use Backendless.initApp(APP_ID, API_KEY) for setup the value');
     }
+  }, {
+    key: "automationPath",
+    get: function get() {
+      if (!this.automationServerURL) {
+        return this.appPath;
+      }
+      return [this.automationServerURL, this.appId, this.apiKey].join('/');
+    },
+    set: function set(automationPath) {
+      throw new Error("Setting '".concat(automationPath, "' value to Backendless.automationPath directly is not possible"));
+    }
 
     ///--------debugMode-------///
   }, {

package/lib/urls.js

@@ -22,7 +22,7 @@ var Urls = /*#__PURE__*/function () {
   }, {
     key: "automation",
     value: function automation() {
-      return "".concat(this.root(), "/automation");
+      return "".concat(this.app.automationPath, "/automation");
     }
   }, {
     key: "automationFlow",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backendless",
-  "version": "7.3.0",
+  "version": "7.3.2",
   "description": "Backendless JavaScript SDK for Node.js and the browser",
   "browser": "dist/backendless.js",
   "main": "lib/index.js",

package/src/automations/index.js

@@ -58,7 +58,7 @@ export default class Automations {
     })
   }
 
-  async activateFlowTriggerById(flowId, triggerId, data) {
+  async activateFlowTriggerById(flowId, triggerId, data, executionId) {
     if (!flowId || typeof flowId !== 'string') {
       throw new Error('The "flowId" argument must be provided and must be a string.')
     }
@@ -71,9 +71,20 @@ export default class Automations {
       throw new Error('The "data" argument must be an object.')
     }
 
+    if (executionId !== undefined && (typeof executionId !== 'string' || !executionId)) {
+      throw new Error('The "executionId" argument must be a non-empty string.')
+    }
+
+    const query = {}
+
+    if (executionId) {
+      query.executionId = executionId
+    }
+
     return this.app.request.post({
-      url : `${this.app.urls.automationFlow()}/${flowId}/trigger/${triggerId}/activate`,
-      data: data || {},
+      url  : `${this.app.urls.automationFlow()}/${flowId}/trigger/${triggerId}/activate`,
+      data : data || {},
+      query: query,
     })
   }
 }

package/src/index.js

@@ -6,14 +6,15 @@ import Utils from './utils'
 import Expression from './expression'
 
 const DEFAULT_PROPS = {
-  appId         : null,
-  apiKey        : null,
-  serverURL     : 'https://api.backendless.com',
-  domain        : null,
-  apiURI        : '/api',
-  debugMode     : false,
-  standalone    : false,
-  XMLHttpRequest: typeof XMLHttpRequest !== 'undefined'
+  appId              : null,
+  apiKey             : null,
+  serverURL          : 'https://api.backendless.com',
+  automationServerURL: null,
+  domain             : null,
+  apiURI             : '/api',
+  debugMode          : false,
+  standalone         : false,
+  XMLHttpRequest     : typeof XMLHttpRequest !== 'undefined'
     ? XMLHttpRequest
     : undefined,
 }
@@ -226,8 +227,17 @@ class Backendless {
     return this.__serverURL
   }
 
-  set serverURL(serverURL) {
-    this.__serverURL = serverURL
+  set serverURL(url) {
+    this.__serverURL = url
+  }
+
+  ///--------automationServerURL-------///
+  get automationServerURL() {
+    return this.__automationServerURL
+  }
+
+  set automationServerURL(url) {
+    this.__automationServerURL = url
   }
 
   ///--------domain-------///
@@ -264,6 +274,20 @@ class Backendless {
     )
   }
 
+  get automationPath() {
+    if (!this.automationServerURL) {
+      return this.appPath
+    }
+
+    return [this.automationServerURL, this.appId, this.apiKey].join('/')
+  }
+
+  set automationPath(automationPath) {
+    throw new Error(
+      `Setting '${automationPath}' value to Backendless.automationPath directly is not possible`
+    )
+  }
+
   ///--------debugMode-------///
   get debugMode() {
     return this.__debugMode

package/src/urls.js

@@ -10,7 +10,7 @@ export default class Urls {
   //automations
 
   automation() {
-    return `${this.root()}/automation`
+    return `${this.app.automationPath}/automation`
   }
 
   automationFlow() {