web-manager 3.1.12 → 3.1.14

package/index.js

@@ -164,14 +164,12 @@ function Manager() {
   }
 
   Manager.prototype.setEventListeners = function() {
-    // console.log('--------setEventListeners');
+    var This = this;
+
     if (!utilities.get(this, 'properties.page.status.eventHandlersSet', false)) {
       this.properties.page.status.eventHandlersSet = true;
-      var This = this;
-      // document.addEventListener('click', function (event) {
+      
       document.addEventListener('click', function (event) {
-        // console.log('Clicked.... NEW');
-        // This.log('Clicked', event.target);
         // auth events
         if (event.target.matches('.auth-signin-email-btn')) {
           This.auth().signIn('email');
@@ -187,16 +185,18 @@ function Manager() {
           This.auth().forgot();
         } else if (event.target.matches('#prechat-btn')) {
           load_tawk(This, This.properties.options);
-        }
-
-        // push notification events
-        if (event.target.matches('.auth-subscribe-notifications-btn')) {
-          //@@@NOTIFICATIONS
+        } else if (event.target.matches('.auth-subscribe-notifications-btn')) {
           This.notifications().subscribe()
-          .catch(function (e) {
-            console.error(e);
-          });
         }
+      
+        // Autorequest
+        if (!This._notificationRequested && This.properties.options.pushNotifications.autoRequest) {
+          This._notificationRequested = true;
+          
+          setTimeout(function () {
+            This.notifications().subscribe()
+          }, This.properties.options.pushNotifications.autoRequest * 1000);
+        }        
 
       }, false);
     }
@@ -1221,16 +1221,6 @@ function Manager() {
       //@@@NOTIFICATIONS
       // _setupTokenRefreshHandler(This);
 
-      if (options_user.pushNotifications.autoRequest) {
-        setTimeout(function () {
-          //@@@NOTIFICATIONS
-          This.notifications().subscribe()
-          .catch(function (e) {
-            console.error(e);
-          });
-        }, options_user.pushNotifications.autoRequest * 1000);
-      }
-
       try {
         // Normally, notifications are not displayed when user is ON PAGE but we will display it here anyway
         firebase.messaging().onMessage(function (payload) {

package/lib/account.js

@@ -151,6 +151,25 @@ Account.prototype.delete = function (options) {
   });
 }
 
+Account.prototype.resolve = function (account, options) {
+  var self = this;
+  return new Promise(function(resolve, reject) {
+    var currentUser = firebase.auth().currentUser;
+
+    // If there is no user logged in or we choose not to fetch the account, resolve a default account
+    if (!currentUser || !currentUser.uid || options.fetchNewAccount === false) {
+      return resolve(self._resolveAccount(currentUser, account, options));
+    }
+
+    // Otherwise, fetch the account from the database and resolve it
+    firebase.firestore().doc('users/' + currentUser.uid)
+    .get()
+    .then(function (doc) {
+      return resolve(self._resolveAccount(currentUser, doc.data(), options));
+    })      
+  });
+}
+
 Account.prototype.resolve = function (account, options) {
   var self = this;
   return new Promise(function(resolve, reject) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "web-manager",
-  "version": "3.1.12",
+  "version": "3.1.14",
   "description": "Easily access important variables such as the query string, current domain, and current page in a single object.",
   "main": "index.js",
   "scripts": {