@quintype/framework 7.33.6-fcm-fix-2.4 → 7.33.6-fcm-fix-2.5

package/client/impl/fcm.js

@@ -3,8 +3,8 @@ export function initializeFCM (firebaseConfig) {
     import(/* webpackChunkName: "firebase-app" */ 'firebase/app'),
     import(/* webpackChunkName: "firebase-messaging" */ 'firebase/messaging')
   ])
-    .then(([firebase, m]) => {
-      console.log('m-----------', m)
+    .then(async ([firebase, m]) => {
+      console.log('firebaseConfig=====', firebaseConfig)
       const app = firebase.initializeApp({
         messagingSenderId: firebaseConfig.messagingSenderId.toString(),
         projectId: firebaseConfig.projectId,
@@ -14,12 +14,14 @@ export function initializeFCM (firebaseConfig) {
         appId: firebaseConfig.appId
       })
       const messaging = m.getMessaging(app)
-
-      // No need to refresh token https://github.com/firebase/firebase-js-sdk/issues/4132
-      requestPermission(m, firebaseConfig, messaging)
-
+      console.log('messaging----', messaging)
+      await requestPermission(m, firebaseConfig, messaging)
+      return { m, messaging }
+    })
+    .then(({ m, messaging }) => {
+      console.log('abc---------', abc)
       m.onMessage(messaging, ({ notification }) => {
-        console.log('========notification', messaging, notification)
+        console.log('notificaation-----', notification)
         new Notification(notification.title, {
           body: notification.body,
           icon: notification.icon
@@ -27,25 +29,30 @@ export function initializeFCM (firebaseConfig) {
       })
     })
     .catch(err => {
-      console.log('fcm initialization error---------', err)
-      console.error(err)
+      console.error(`FCM subscription failed ${err}`)
     })
 }
 
 async function requestPermission (m, firebaseConfig, messaging) {
-  console.log('request oermission------')
-  //requesting permission using Notification API
   const permission = await Notification.requestPermission()
-
+  console.log('permission------', permission)
   if (permission === 'granted') {
-    const token = await m.getToken(messaging, {
+    const token = m.getToken(messaging, {
       vapidKey: firebaseConfig.vapidKey
     })
-
-    //We can send token to server
-    console.log('Token generated : ', token)
+    return registerFCMTopic(token)
   } else if (permission === 'denied') {
-    //notifications are blocked
-    alert('You denied for the notification')
+    console.log('notifications are denied')
+    return
   }
 }
+
+function registerFCMTopic (token) {
+  return fetch('/register-fcm-topic', {
+    method: 'post',
+    headers: {
+      'Content-Type': 'application/json'
+    },
+    body: JSON.stringify({ token: token })
+  })
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.33.6-fcm-fix-2.4",
+  "version": "7.33.6-fcm-fix-2.5",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {

package/server/handlers/fcm-registration-handler.js

@@ -1,38 +1,32 @@
-const { get } = require("lodash");
-const request = require("request-promise");
+const { get } = require('lodash')
+const request = require('request-promise')
+const { initializeApp } = require('firebase/app')
+const { getMessaging } = require('firebase/messaging')
 
-exports.registerFCMTopic = async function registerFCM(
+exports.registerFCMTopic = async function registerFCM (
   req,
   res,
   next,
   { config, client, publisherConfig, fcmServerKey }
 ) {
-  const token = get(req, ["body", "token"], null);
+  console.log('fcm server')
+  const token = get(req, ['body', 'token'], null)
   if (!token) {
-    res.status(400).send("No Token Found");
-    return;
+    res.status(400).send('No Token Found')
+    return
   }
 
-  const serverKey = typeof fcmServerKey === "function" ? await fcmServerKey(config) : fcmServerKey;
-
-  if (!serverKey) {
-    res.status(500).send("Server Key is not available");
-    return;
-  }
-  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`;
-  try {
-    await request({
-      uri: url,
-      method: "POST",
-      headers: {
-        Authorization: `key=${serverKey}`,
-        "content-type": "application/json",
-      },
-    });
-    res.status(200).send("Registration Done Suceessfuly");
-    return;
-  } catch (error) {
-    res.status(500).send("FCM Subscription Failed");
-    return;
+  const firebaseConfig = {
+    apiKey: 'AIzaSyDh-FPToRoj1b_XvL6hWnZ84jlb_AaWG1U',
+    authDomain: 'quintypeqa-d3e3f.firebaseapp.com',
+    projectId: 'quintypeqa-d3e3f',
+    storageBucket: 'quintypeqa-d3e3f.firebasestorage.app',
+    messagingSenderId: '919899876354',
+    appId: '1:919899876354:web:2ac17705ee7fc8364f4b1b',
+    measurementId: 'G-V72DFHSJVX'
   }
-};
+  const app = initializeApp(firebaseConfig)
+  console.log('initialze app')
+  const messaging = getMessaging(app)
+  console.log('firebaseMessaging==========', messaging)
+}