@quintype/framework 7.3.2-node16.2 → 7.3.2-node16.5

package/client/impl/fcm.js

@@ -1,39 +1,30 @@
-export function initializeFCM(messageSenderId) {
-  if (!messageSenderId) {
-    console.log("messageSenderId is required");
+export function initializeFCM(firebaseConfig) {
+  if (!firebaseConfig.messagingSenderId) {
+    console.log("messagingSenderId is required");
     return false;
   }
   Promise.all([
     import(/* webpackChunkName: "firebase-app" */ "firebase/app"),
     import(/* webpackChunkName: "firebase-messaging" */ "firebase/messaging"),
-  ]).then(([firebase, m]) => {
-    try {
-      firebase.initializeApp({
-        messagingSenderId: messageSenderId.toString(),
+  ])
+    .then(([firebase, m]) => {
+      const app = firebase.initializeApp({
+        messagingSenderId: firebaseConfig.messagingSenderId.toString(),
+        projectId: firebaseConfig.projectId,
+        apiKey: firebaseConfig.apiKey,
+        storageBucket: firebaseConfig.storageBucket,
+        authDomain: firebaseConfig.authDomain,
+        appId: firebaseConfig.appId,
       });
-      const messaging = firebase.messaging();
-      messaging.requestPermission().then(() => {
-        updateToken(firebase)
-          .then(() => {
-            messaging.onTokenRefresh(() => updateToken(firebase));
-          })
-          .catch(console.error);
-      });
-    } catch (error) {
-      console.error(error);
-    }
-  });
-}
-
-function updateToken(firebaseInstance) {
-  return firebaseInstance
-    .messaging()
-    .getToken()
+      const messaging = m.getMessaging(app);
+      return m.getToken(messaging);
+      // No need to refresh token https://github.com/firebase/firebase-js-sdk/issues/4132
+    })
     .then((token) => {
       return registerFCMTopic(token);
     })
     .catch((err) => {
-      throw new Error(err);
+      console.error(err);
     });
 }
 

package/client/start.js

@@ -282,10 +282,12 @@ export function startApp(renderApplication, reducers, opts) {
 
     store.dispatch({ type: NAVIGATE_TO_PAGE, page, currentPath: path });
 
-    if (opts.fcmMessagingSenderId) {
-      const mssgSenderId =
-        typeof opts.fcmMessagingSenderId === "function" ? opts.fcmMessagingSenderId(page) : opts.fcmMessagingSenderId;
-      mssgSenderId && initializeFCM(mssgSenderId);
+    if (opts.firebaseConfig) {
+      const fcm = typeof opts.firebaseConfig === "function" ? opts.firebaseConfig(page) : opts.firebaseConfig;
+      if (fcm) {
+        const mssgSenderId = fcm.messagingSenderId;
+        mssgSenderId && initializeFCM(fcm);
+      }
     }
 
     const { config: { "theme-attributes": pageThemeAttributes = {} } = {} } = page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.3.2-node16.2",
+  "version": "7.3.2-node16.5",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "scripts": {