backendless 6.2.25 → 6.3.3

package/src/index.js

@@ -56,6 +56,17 @@ const parseInitConfig = (...args) => {
   }
 }
 
+const validateConfig = config => {
+  if (config.domain) {
+    if (!config.domain.startsWith('https://') && !config.domain.startsWith('http://')) {
+      throw new Error(
+        'When initialize the SDK with a custom domain it should start with http:// or https://, ' +
+        'for example: Backendless.initApp(\'https://foobar.com\')'
+      )
+    }
+  }
+}
+
 const SERVICES = {
   'Logging'     : () => require('./logging').default,
   'Counters'    : () => require('./counters').default,
@@ -86,6 +97,13 @@ class Backendless {
    * @param {Object} config
    */
   initConfig(config) {
+    config = { ...config }
+
+    if (config.domain) {
+      delete config.appId
+      delete config.apiKey
+    }
+
     for (const key in DEFAULT_PROPS) {
       if (DEFAULT_PROPS.hasOwnProperty(key)) {
         const privateKey = `__${key}`
@@ -107,12 +125,14 @@ class Backendless {
 
   /**
    * @param {string|Object} appId|domain|config
-   * @param {string} [secretKey]
+   * @param {string} [apiKey]
    * @returns {Backendless}
    */
   initApp() {
     const config = parseInitConfig(...arguments)
 
+    validateConfig(config)
+
     const app = config.standalone
       ? new Backendless(this)
       : this
@@ -170,26 +190,24 @@ class Backendless {
     )
   }
 
-  ///--------applicationId-------///
-  get applicationId() {
+  get appId() {
     return this.__appId
   }
 
-  set applicationId(appId) {
+  set appId(appId) {
     throw new Error(
-      `Setting '${appId}' value to Backendless.applicationId directly is not possible, ` +
+      `Setting '${appId}' value to Backendless.appId directly is not possible, ` +
       `instead you must use Backendless.initApp('${appId}', API_KEY)`
     )
   }
 
-  ///--------secretKey-------///
-  get secretKey() {
+  get apiKey() {
     return this.__apiKey
   }
 
-  set secretKey(apiKey) {
+  set apiKey(apiKey) {
     throw new Error(
-      `Setting '${apiKey}' value to Backendless.secretKey directly is not possible, ` +
+      `Setting '${apiKey}' value to Backendless.apiKey directly is not possible, ` +
       `instead you must use Backendless.initApp(APP_ID, '${apiKey}')`
     )
   }
@@ -227,7 +245,7 @@ class Backendless {
       return this.domain + this.apiURI
     }
 
-    return [this.serverURL, this.applicationId, this.secretKey].join('/')
+    return [this.serverURL, this.appId, this.apiKey].join('/')
   }
 
   set appPath(appPath) {
@@ -399,7 +417,38 @@ class Backendless {
   ///-------------------------------------///
   ///--------BACKWARD COMPATIBILITY-------///
 
-  //TODO: do we need to remove it?
+  /** @deprecated */
+  get applicationId() {
+    // eslint-disable-next-line no-console
+    // temporary comment it because it breaks JS-CodeRunner version less than 6.3.0
+    // console.warn('getter/setter for Backendless.applicationId is deprecated, instead use Backendless.appId')
+
+    return this.appId
+  }
+
+  /** @deprecated */
+  set applicationId(appId) {
+    // eslint-disable-next-line no-console
+    console.warn('getter/setter for Backendless.applicationId is deprecated, instead use Backendless.appId')
+
+    this.appId = appId
+  }
+
+  /** @deprecated */
+  get secretKey() {
+    // eslint-disable-next-line no-console
+    console.warn('getter/setter for Backendless.secretKey is deprecated, instead use Backendless.apiKey')
+
+    return this.apiKey
+  }
+
+  /** @deprecated */
+  set secretKey(apiKey) {
+    // eslint-disable-next-line no-console
+    console.warn('getter/setter for Backendless.secretKey is deprecated, instead use Backendless.apiKey')
+
+    this.apiKey = apiKey
+  }
 
   /** @deprecated */
   get Persistence() {

package/src/local-cache/index.js

@@ -9,7 +9,7 @@ export default class LocalCache {
   constructor(app) {
     this.app = app
 
-    this.storageName = `${STORAGE_KEY_NAMESPACE}_${this.app.applicationId}`
+    this.storageName = `${STORAGE_KEY_NAMESPACE}_${this.app.appId}`
 
     const Storage = Utils.isLocalStorageSupported
       ? LocalStorage

package/src/messaging/helpers/email-envelope.js

@@ -18,6 +18,7 @@ export default class EmailEnvelope {
     this.ccAddresses = Utils.castArray(data.ccAddresses)
     this.bccAddresses = Utils.castArray(data.bccAddresses)
     this.query = data.query || null
+    this.uniqueEmails = data.uniqueEmails || false
   }
 
   /**
@@ -129,6 +130,23 @@ export default class EmailEnvelope {
     return this.query
   }
 
+  /**
+   * @param {boolean} uniqueEmails
+   * @returns {EmailEnvelope}
+   */
+  setUniqueEmails(uniqueEmails) {
+    this.uniqueEmails = uniqueEmails
+
+    return this
+  }
+
+  /**
+   * @returns {uniqueEmails|boolean}
+   */
+  getUniqueEmails() {
+    return this.uniqueEmails
+  }
+
   toJSON() {
     const data = {}
 
@@ -148,6 +166,8 @@ export default class EmailEnvelope {
       data.criteria = this.query
     }
 
+    data.uniqueEmails = this.uniqueEmails
+
     return data
   }
 }

package/src/messaging/index.js

@@ -118,10 +118,14 @@ export default class Messaging {
 
     data['template-name'] = templateName
 
-    if (templateValues) {
+    if (templateValues && !Array.isArray(templateValues)) {
       data['template-values'] = templateValues
     }
 
+    if (Array.isArray(templateValues) && !attachments) {
+      attachments = templateValues
+    }
+
     if (attachments) {
       data.attachment = attachments
     }

package/src/rt.js

@@ -1,3 +1,4 @@
+import Request from 'backendless-request'
 import BackendlessRTClient from 'backendless-rt-client'
 
 import Utils from './utils'
@@ -5,25 +6,41 @@ import Utils from './utils'
 export const RTListeners = BackendlessRTClient.Listeners
 export const RTScopeConnector = BackendlessRTClient.ScopeConnector
 
+function loadAppInfo(appPath) {
+  return Request.get(`${appPath}/info`)
+}
+
 export default class RT extends BackendlessRTClient {
   constructor(app) {
-    const { applicationId: appId, secretKey: apiKey, appPath, debugMode } = app
+    const { appId, apiKey, appPath, debugMode } = app
 
     const clientId = Utils.uuid()
     const lookupPath = `${appPath}/rt/lookup`
 
     super({
-      appId,
+      appId: appId || undefined,
       lookupPath,
       debugMode,
       connectQuery() {
         const userToken = app.getCurrentUserToken()
 
         return {
-          apiKey,
+          apiKey: apiKey || undefined,
           clientId,
           userToken,
         }
+      },
+
+      socketConfigTransform: async socketConfig => {
+        if (!appId) {
+          const appInfo = await loadAppInfo(appPath)
+
+          socketConfig.url = `${socketConfig.host}/${appInfo.appId}`
+          socketConfig.options.path = `/${appInfo.appId}`
+          socketConfig.options.query.apiKey = appInfo.apiKey
+        }
+
+        return socketConfig
       }
     })
 

package/src/unit-of-work/constants.js

@@ -5,6 +5,8 @@ export const OperationType = {
   UPDATE_BULK    : 'UPDATE_BULK',
   DELETE         : 'DELETE',
   DELETE_BULK    : 'DELETE_BULK',
+  UPSERT         : 'UPSERT',
+  UPSERT_BULK    : 'UPSERT_BULK',
   FIND           : 'FIND',
   ADD_RELATION   : 'ADD_RELATION',
   SET_RELATION   : 'SET_RELATION',

package/src/unit-of-work/index.js

@@ -219,6 +219,35 @@ class UnitOfWork {
     return this.addOperations(OperationType.FIND, tableName, payload)
   }
 
+  /**
+   * upsert(object: object): OpResult;
+   * upsert(tableName: string, object: object): OpResult;
+   * **/
+  upsert(...args) {
+    let tableName
+    let changes
+
+    if (args.length === 1) {
+      tableName = Utils.getClassName(args[0])
+      changes = args[0]
+    } else if (args.length === 2) {
+      tableName = args[0]
+      changes = args[1]
+    } else {
+      throw new Error('Invalid arguments')
+    }
+
+    if (!tableName || typeof tableName !== 'string') {
+      throw new Error('Invalid arguments')
+    }
+
+    if (!changes || typeof changes !== 'object' || Array.isArray(changes)) {
+      throw new Error('Invalid arguments')
+    }
+
+    return this.addOperations(OperationType.UPSERT, tableName, changes)
+  }
+
   /**
    * create(object: object): OpResult;
    * create(tableName: string, object: object): OpResult;
@@ -342,6 +371,27 @@ class UnitOfWork {
     return this.addOperations(OperationType.DELETE, tableName, object)
   }
 
+  /**
+   * bulkUpsert(tableName: string, objects: object[]): OpResult;
+   * bulkUpsert(objects: object[]): OpResult;
+   * **/
+  bulkUpsert(tableName, objects) {
+    if (Array.isArray(tableName)) {
+      objects = tableName
+      tableName = Utils.getClassName(objects[0])
+    }
+
+    if (!objects || !Array.isArray(objects)) {
+      throw new Error('Objects must be an array of objects.')
+    }
+
+    if (!tableName || typeof tableName !== 'string') {
+      throw new Error('Table Name must be a string.')
+    }
+
+    return this.addOperations(OperationType.UPSERT_BULK, tableName, objects)
+  }
+
   /**
    * bulkCreate(tableName: string, objects: object[]): OpResult;
    * bulkCreate(objects: object[]): OpResult;
@@ -600,7 +650,7 @@ export default function UnitOfWorkService(app) {
 
         opResult.setOpResultId(op.opResultId)
       })
-      
+
       return uow
     }
 

package/src/unit-of-work/json-adapter.js

@@ -41,6 +41,8 @@ export const OperationJSONAdapter = {
 
   UPDATE: (uow, { table, payload }) => uow.update.call(uow, table, resolveOpResultValueReference(uow, payload)),
 
+  UPSERT: (uow, { table, payload }) => uow.upsert.call(uow, table, resolveOpResultValueReference(uow, payload)),
+
   UPDATE_BULK: (uow, { table, payload }) => {
     const args = baseBulkArgs(uow, { table, payload })
 
@@ -59,6 +61,10 @@ export const OperationJSONAdapter = {
     return uow.bulkCreate.call(uow, table, resolveOpResultValueReference(uow, payload))
   },
 
+  UPSERT_BULK: (uow, { table, payload }) => {
+    return uow.bulkUpsert.call(uow, table, resolveOpResultValueReference(uow, payload))
+  },
+
   SET_RELATION: (uow, { table, payload }) => updateRelations(uow, 'setRelation', { table, payload }),
 
   DELETE_RELATION: (uow, { table, payload }) => updateRelations(uow, 'deleteRelation', { table, payload }),

package/src/urls.js

@@ -109,6 +109,10 @@ export default class Urls {
     return `${this.data()}/${tableName}`
   }
 
+  dataTableUpsert(tableName) {
+    return `${this.data()}/${tableName}/upsert`
+  }
+
   dataTableDeepSave(tableName) {
     return `${this.data()}/${tableName}/deep-save`
   }
@@ -141,6 +145,10 @@ export default class Urls {
     return `${this.data()}/bulk/${tableName}`
   }
 
+  dataBulkTableUpsert(tableName) {
+    return `${this.data()}/bulkupsert/${tableName}`
+  }
+
   dataBulkTableDelete(tableName) {
     return `${this.dataBulkTable(tableName)}/delete`
   }