@quintype/framework 7.33.6-fcm-fix-1.3 → 7.33.6-fcm-fix-2.0

package/client/impl/fcm.js

@@ -4,6 +4,7 @@ export function initializeFCM (firebaseConfig) {
     import(/* webpackChunkName: "firebase-messaging" */ 'firebase/messaging')
   ])
     .then(([firebase, m]) => {
+      console.log('m-----------', m)
       const app = firebase.initializeApp({
         messagingSenderId: firebaseConfig.messagingSenderId.toString(),
         projectId: firebaseConfig.projectId,
@@ -12,28 +13,12 @@ export function initializeFCM (firebaseConfig) {
         authDomain: firebaseConfig.authDomain,
         appId: firebaseConfig.appId
       })
-      const messaging = m.getMessaging(app)
-      return firebaseConfig?.vapidKey
-        ? m.getToken(messaging, {
-            vapidKey: firebaseConfig.vapidKey
-          })
-        : m.getToken(messaging)
+      m.getMessaging(app)
+      return
       // No need to refresh token https://github.com/firebase/firebase-js-sdk/issues/4132
     })
-    .then(token => {
-      return registerFCMTopic(token)
-    })
     .catch(err => {
+      console.log('fcm initialization error---------', err)
       console.error(err)
     })
 }
-
-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-1.3",
+  "version": "7.33.6-fcm-fix-2.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -45,8 +45,7 @@
     "compression": "^1.7.4",
     "ejs": "^3.1.6",
     "express": "^4.17.1",
-    "firebase": "^9.6.10",
-    "firebase-admin": "^13.1.0",
+    "firebase": "^9.23.0",
     "get-youtube-id": "^1.0.1",
     "http-proxy": "^1.18.1",
     "js-yaml": "^4.1.0",

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

@@ -1,54 +1,38 @@
-const { get } = require('lodash')
-const request = require('request-promise')
-const admin = require('firebase-admin')
+const { get } = require("lodash");
+const request = require("request-promise");
 
-exports.registerFCMTopic = async function registerFCM (
+exports.registerFCMTopic = async function registerFCM(
   req,
   res,
   next,
-  { config, client, publisherConfig, fcmServerKey, fcmServiceAccountJson }
+  { config, client, publisherConfig, fcmServerKey }
 ) {
-  const token = get(req, ['body', 'token'], null)
+  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 serviceAccount = await fcmServiceAccountJson
-    .then(serviceAccount => {
-      console.log('service account----fdsdf', serviceAccount)
-      return serviceAccount
-    })
-    .catch(error => {
-      res.status(400).send(`No Service Account Json: ${error}`)
-      return
-    })
+  const serverKey = typeof fcmServerKey === "function" ? await fcmServerKey(config) : fcmServerKey;
 
-  admin.initializeApp({
-    credential: admin.credential.cert(serviceAccount)
-  })
-
-  console.log('admin------', admin)
-  const oauthToken = await admin.credential
-    .cert(serviceAccount)
-    .getAccessToken()
-    .then(tokenObj => {
-      console.log('OAuth2 Access Token:', tokenObj)
-      if (tokenObj && tokenObj.access_token) {
-        return tokenObj.access_token
-      }
-    })
-    .catch(error => res.status(400).send(`Oauth Token is not available: ${error}`))
-
-  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`
-  await request({
-    uri: url,
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${oauthToken}`,
-      'content-type': 'application/json'
-    }
-  })
-    .then(() => res.status(200).send('Registration Done Successfully'))
-    .catch(error => res.status(500).send(`FCM Subscription Failed: ${error}`))
-}
+  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;
+  }
+};

package/server/routes.js

@@ -356,8 +356,7 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     webengageConfig = {},
     externalIdPattern = '',
     enableExternalStories = false,
-    lazyLoadImageMargin,
-    fcmServiceAccountJson
+    lazyLoadImageMargin
   }
 ) {
   const withConfig = withConfigPartial(getClient, logError, publisherConfig, configWrapper)
@@ -470,11 +469,7 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     })
   )
 
-  app.post(
-    '/register-fcm-topic',
-    bodyParser.json(),
-    withConfig(registerFCMTopic, { publisherConfig, fcmServerKey, fcmServiceAccountJson })
-  )
+  app.post('/register-fcm-topic', bodyParser.json(), withConfig(registerFCMTopic, { publisherConfig, fcmServerKey }))
 
   if (webengageConfig.enableWebengage) {
     app.post(