backendless 7.4.6 → 7.4.8

package/es/index.js

@@ -29,8 +29,7 @@ var DEFAULT_PROPS = {
   XMLHttpRequest: typeof XMLHttpRequest !== 'undefined' ? XMLHttpRequest : undefined
 };
 var STATELESS_PROPS = ['appId', 'apiKey', 'domain'];
-var root = (typeof self === "undefined" ? "undefined" : (0, _typeof2["default"])(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2["default"])(global)) === 'object' && global.global === global && global;
-var previousBackendless = root && root.Backendless;
+var previousBackendless = _utils["default"].globalScope && _utils["default"].globalScope.Backendless;
 var showLegacyDataWarning = function showLegacyDataWarning() {
   if (!showLegacyDataWarning.isShown) {
     // eslint-disable-next-line no-console
@@ -190,9 +189,21 @@ var Backendless = /*#__PURE__*/function () {
         this.__appInfoPromise = new Promise(function (resolve, reject) {
           _this.request.get({
             url: _this.urls.appInfo()
-          }).then(resolve)["catch"](reject);
+          }).then(resolve)["catch"](function (error) {
+            if (error.code === 3064) {
+              _this.setCurrentUserToken(null);
+              return _this.request.get({
+                url: _this.urls.appInfo()
+              });
+            }
+            throw error;
+          })["catch"](reject);
         });
       }
+      this.__appInfoPromise["catch"](function (error) {
+        // eslint-disable-next-line no-console
+        console.error('could not load backendless app info', error);
+      });
       return this.__appInfoPromise;
     }
   }, {
@@ -380,8 +391,8 @@ var Backendless = /*#__PURE__*/function () {
   }, {
     key: "noConflict",
     value: function noConflict() {
-      if (root) {
-        root.Backendless = previousBackendless;
+      if (_utils["default"].globalScope) {
+        _utils["default"].globalScope.Backendless = previousBackendless;
       }
       return this;
     }
@@ -606,8 +617,8 @@ var Backendless = /*#__PURE__*/function () {
   return Backendless;
 }();
 var backendless = new Backendless(DEFAULT_PROPS);
-if (root) {
-  root.Backendless = backendless;
+if (_utils["default"].globalScope) {
+  _utils["default"].globalScope.Backendless = backendless;
 }
 exports = module.exports = backendless;
 var _default = backendless;

package/es/user-agent.js

@@ -9,6 +9,7 @@ var _utils = _interopRequireDefault(require("./utils"));
 function getUserAgent() {
   var ua = 'NodeJS';
   if (_utils["default"].isBrowser) {
+    var navigator = _utils["default"].getWindowNavigator();
     ua = navigator.userAgent ? navigator.userAgent.toLowerCase() : 'hybrid-app';
   }
   var match = /(chrome)[ \/]([\w.]+)/.exec(ua) || /(webkit)[ \/]([\w.]+)/.exec(ua) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || /(msie) ([\w.]+)/.exec(ua) || ua.indexOf('compatible') < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || [];

package/es/users/utils.js

@@ -1,12 +1,15 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UsersUtils = void 0;
+var _utils = _interopRequireDefault(require("../utils"));
 var UsersUtils = {
   getClientUserLocale: function getClientUserLocale() {
-    if (typeof navigator === 'undefined') {
+    var navigator = _utils["default"].getWindowNavigator();
+    if (typeof navigator === 'undefined' || !navigator) {
       return;
     }
     var language = '';

package/es/utils.js

@@ -9,7 +9,7 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var Utils = {
   isBrowser: isBrowser(),
   isLocalStorageSupported: isLocalStorageSupported(),
-  globalScope: (typeof self === "undefined" ? "undefined" : (0, _typeof2["default"])(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2["default"])(global)) === 'object' && global.global === global && global,
+  globalScope: (typeof self === "undefined" ? "undefined" : (0, _typeof2["default"])(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2["default"])(global)) === 'object' && global.global === global && global || (typeof globalThis === "undefined" ? "undefined" : (0, _typeof2["default"])(globalThis)) === 'object' && globalThis,
   castArray: function castArray(value) {
     if (Array.isArray(value)) {
       return value;
@@ -58,6 +58,15 @@ var Utils = {
   },
   isObject: function isObject(obj) {
     return obj != null && obj.constructor.name === 'Object';
+  },
+  getWindowNavigator: function getWindowNavigator() {
+    if (typeof __test_navigator !== 'undefined') {
+      return __test_navigator;
+    }
+    if (typeof navigator !== 'undefined') {
+      return navigator;
+    }
+    return Utils.globalScope && Utils.globalScope.navigator;
   }
 };
 function isBrowser() {

package/lib/index.js

@@ -29,8 +29,7 @@ var DEFAULT_PROPS = {
   XMLHttpRequest: typeof XMLHttpRequest !== 'undefined' ? XMLHttpRequest : undefined
 };
 var STATELESS_PROPS = ['appId', 'apiKey', 'domain'];
-var root = (typeof self === "undefined" ? "undefined" : (0, _typeof2["default"])(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2["default"])(global)) === 'object' && global.global === global && global;
-var previousBackendless = root && root.Backendless;
+var previousBackendless = _utils["default"].globalScope && _utils["default"].globalScope.Backendless;
 var showLegacyDataWarning = function showLegacyDataWarning() {
   if (!showLegacyDataWarning.isShown) {
     // eslint-disable-next-line no-console
@@ -190,9 +189,21 @@ var Backendless = /*#__PURE__*/function () {
         this.__appInfoPromise = new Promise(function (resolve, reject) {
           _this.request.get({
             url: _this.urls.appInfo()
-          }).then(resolve)["catch"](reject);
+          }).then(resolve)["catch"](function (error) {
+            if (error.code === 3064) {
+              _this.setCurrentUserToken(null);
+              return _this.request.get({
+                url: _this.urls.appInfo()
+              });
+            }
+            throw error;
+          })["catch"](reject);
         });
       }
+      this.__appInfoPromise["catch"](function (error) {
+        // eslint-disable-next-line no-console
+        console.error('could not load backendless app info', error);
+      });
       return this.__appInfoPromise;
     }
   }, {
@@ -380,8 +391,8 @@ var Backendless = /*#__PURE__*/function () {
   }, {
     key: "noConflict",
     value: function noConflict() {
-      if (root) {
-        root.Backendless = previousBackendless;
+      if (_utils["default"].globalScope) {
+        _utils["default"].globalScope.Backendless = previousBackendless;
       }
       return this;
     }
@@ -606,8 +617,8 @@ var Backendless = /*#__PURE__*/function () {
   return Backendless;
 }();
 var backendless = new Backendless(DEFAULT_PROPS);
-if (root) {
-  root.Backendless = backendless;
+if (_utils["default"].globalScope) {
+  _utils["default"].globalScope.Backendless = backendless;
 }
 exports = module.exports = backendless;
 var _default = backendless;

package/lib/user-agent.js

@@ -9,6 +9,7 @@ var _utils = _interopRequireDefault(require("./utils"));
 function getUserAgent() {
   var ua = 'NodeJS';
   if (_utils["default"].isBrowser) {
+    var navigator = _utils["default"].getWindowNavigator();
     ua = navigator.userAgent ? navigator.userAgent.toLowerCase() : 'hybrid-app';
   }
   var match = /(chrome)[ \/]([\w.]+)/.exec(ua) || /(webkit)[ \/]([\w.]+)/.exec(ua) || /(opera)(?:.*version|)[ \/]([\w.]+)/.exec(ua) || /(msie) ([\w.]+)/.exec(ua) || ua.indexOf('compatible') < 0 && /(mozilla)(?:.*? rv:([\w.]+)|)/.exec(ua) || [];

package/lib/users/utils.js

@@ -1,12 +1,15 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UsersUtils = void 0;
+var _utils = _interopRequireDefault(require("../utils"));
 var UsersUtils = {
   getClientUserLocale: function getClientUserLocale() {
-    if (typeof navigator === 'undefined') {
+    var navigator = _utils["default"].getWindowNavigator();
+    if (typeof navigator === 'undefined' || !navigator) {
       return;
     }
     var language = '';

package/lib/utils.js

@@ -9,7 +9,7 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var Utils = {
   isBrowser: isBrowser(),
   isLocalStorageSupported: isLocalStorageSupported(),
-  globalScope: (typeof self === "undefined" ? "undefined" : (0, _typeof2["default"])(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2["default"])(global)) === 'object' && global.global === global && global,
+  globalScope: (typeof self === "undefined" ? "undefined" : (0, _typeof2["default"])(self)) === 'object' && self.self === self && self || (typeof global === "undefined" ? "undefined" : (0, _typeof2["default"])(global)) === 'object' && global.global === global && global || (typeof globalThis === "undefined" ? "undefined" : (0, _typeof2["default"])(globalThis)) === 'object' && globalThis,
   castArray: function castArray(value) {
     if (Array.isArray(value)) {
       return value;
@@ -58,6 +58,15 @@ var Utils = {
   },
   isObject: function isObject(obj) {
     return obj != null && obj.constructor.name === 'Object';
+  },
+  getWindowNavigator: function getWindowNavigator() {
+    if (typeof __test_navigator !== 'undefined') {
+      return __test_navigator;
+    }
+    if (typeof navigator !== 'undefined') {
+      return navigator;
+    }
+    return Utils.globalScope && Utils.globalScope.navigator;
   }
 };
 function isBrowser() {

package/package.json

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

package/src/index.js

@@ -21,12 +21,7 @@ const DEFAULT_PROPS = {
 
 const STATELESS_PROPS = ['appId', 'apiKey', 'domain']
 
-const root = (
-  (typeof self === 'object' && self.self === self && self) ||
-  (typeof global === 'object' && global.global === global && global)
-)
-
-const previousBackendless = root && root.Backendless
+const previousBackendless = Utils.globalScope && Utils.globalScope.Backendless
 
 const showLegacyDataWarning = () => {
   if (!showLegacyDataWarning.isShown) {
@@ -173,10 +168,25 @@ class Backendless {
       this.__appInfoPromise = new Promise((resolve, reject) => {
         this.request.get({ url: this.urls.appInfo() })
           .then(resolve)
+          .catch(error => {
+            if (error.code === 3064) {
+              this.setCurrentUserToken(null)
+
+              return this.request.get({ url: this.urls.appInfo() })
+            }
+
+            throw error
+          })
           .catch(reject)
       })
     }
 
+    this.__appInfoPromise
+      .catch(error => {
+        // eslint-disable-next-line no-console
+        console.error('could not load backendless app info', error)
+      })
+
     return this.__appInfoPromise
   }
 
@@ -373,8 +383,8 @@ class Backendless {
   }
 
   noConflict() {
-    if (root) {
-      root.Backendless = previousBackendless
+    if (Utils.globalScope) {
+      Utils.globalScope.Backendless = previousBackendless
     }
 
     return this
@@ -566,8 +576,8 @@ class Backendless {
 
 const backendless = new Backendless(DEFAULT_PROPS)
 
-if (root) {
-  root.Backendless = backendless
+if (Utils.globalScope) {
+  Utils.globalScope.Backendless = backendless
 }
 
 exports = module.exports = backendless

package/src/user-agent.js

@@ -4,6 +4,8 @@ export function getUserAgent() {
   let ua = 'NodeJS'
 
   if (Utils.isBrowser) {
+    const navigator = Utils.getWindowNavigator()
+
     ua = navigator.userAgent ? navigator.userAgent.toLowerCase() : 'hybrid-app'
   }
 

package/src/users/utils.js

@@ -1,6 +1,10 @@
+import Utils from '../utils'
+
 export const UsersUtils = {
   getClientUserLocale() {
-    if (typeof navigator === 'undefined') {
+    const navigator = Utils.getWindowNavigator()
+
+    if (typeof navigator === 'undefined' || !navigator) {
       return
     }
 

package/src/utils.js

@@ -6,7 +6,8 @@ const Utils = {
 
   globalScope: (
     (typeof self === 'object' && self.self === self && self) ||
-    (typeof global === 'object' && global.global === global && global)
+    (typeof global === 'object' && global.global === global && global) ||
+    (typeof globalThis === 'object' && globalThis)
   ),
 
   castArray(value) {
@@ -63,6 +64,18 @@ const Utils = {
 
   isObject(obj) {
     return obj != null && obj.constructor.name === 'Object'
+  },
+
+  getWindowNavigator() {
+    if (typeof __test_navigator !== 'undefined') {
+      return __test_navigator
+    }
+
+    if (typeof navigator !== 'undefined') {
+      return navigator
+    }
+
+    return Utils.globalScope && Utils.globalScope.navigator
   }
 }