web-manager 3.2.69 → 3.2.71

package/index.js

@@ -1088,13 +1088,13 @@ Manager.prototype.notifications = function(options) {
                   },
                 )
                 .then(function(data) {
-                  // self.log('Updated token: ', token);
+                  // self.log('Updated token:', token);
                   saveLocal();
                   resolve(true);
                 })
               } else {
                 saveLocal();
-                // self.log('Skip sync, server data exists.');
+                // self.log('Skip sync because server data exists');
                 resolve(false);
               }
             }
@@ -1109,7 +1109,7 @@ Manager.prototype.notifications = function(options) {
               saveServer({exists: false})
             })
           } else {
-            // self.log('Skip sync, recently done.');
+            // self.log('Skip sync because recently done');
             resolve(false);
           }
 
@@ -1147,7 +1147,10 @@ function subscriptionManager(self, options_user) {
     }))
   )
   .then(function (registration) {
+    // Force Firebase to use the service worker
     // firebase.messaging().useServiceWorker(registration);
+
+    // Set the registration to the properties
     self.properties.references.serviceWorker = registration;
 
     // TODO: https://googlechrome.github.io/samples/service-worker/post-message/
@@ -1187,19 +1190,36 @@ function subscriptionManager(self, options_user) {
     //@@@NOTIFICATIONS
     // _setupTokenRefreshHandler(self);
 
+    // Force update the service worker
+    registration.update();
+
+    // Normally, notifications are not displayed when user is ON PAGE but we will display it here anyway
     try {
-      // Normally, notifications are not displayed when user is ON PAGE but we will display it here anyway
       firebase.messaging().onMessage(function (payload) {
-        new Notification(payload.notification.title, payload.notification)
+        // Get the notification data
+        var notification = payload.notification;
+
+        // Log
+        console.log('Message received', payload);
+
+        // Display notification
+        new Notification(notification.title, notification)
         .onclick = function(event) {
-          event.preventDefault(); // prevent the browser from focusing the Notification's tab
-          window.open(payload.notification.click_action, '_blank');
+          // Quit if there is no click action
+          if (!notification.click_action) {
+            return;
+          }
+
+          // prevent the browser from focusing the Notification's tab
+          event.preventDefault();
+
+          // Open the click action
+          window.open(notification.click_action, '_blank');
         }
       })
     } catch (e) {
       console.error(e);
     }
-
   })
   .catch(function (e) {
     // console.log('***2');

package/package.json

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