@quintype/framework 7.33.5 → 7.33.6-fcm-fix.1

package/client/impl/fcm.js

@@ -1,35 +1,79 @@
-export function initializeFCM(firebaseConfig) {
+export function initializeFCM (firebaseConfig, config) {
+  console.log('opts--------', firebaseConfig)
   Promise.all([
-    import(/* webpackChunkName: "firebase-app" */ "firebase/app"),
-    import(/* webpackChunkName: "firebase-messaging" */ "firebase/messaging"),
+    import(/* webpackChunkName: "firebase-app" */ 'firebase/app'),
+    import(/* webpackChunkName: "firebase-messaging" */ 'firebase/messaging'),
+    import(/* webpackChunkName: "firebase-auth" */ 'firebase/auth')
   ])
-    .then(([firebase, m]) => {
+    .then(([firebase, m, a]) => {
       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 = m.getMessaging(app);
-      return m.getToken(messaging);
+        appId: firebaseConfig.appId
+      })
+      const token = getToken(app, m, firebaseConfig?.vapidKey)
+      console.log("final token----", token);
+      const oauthToken = getOAuthToken(a)
+      console.log("final oauthToken----", oauthToken);
+      return { token: token, oauthToken: oauthToken }
       // No need to refresh token https://github.com/firebase/firebase-js-sdk/issues/4132
     })
-    .then((token) => {
-      return registerFCMTopic(token);
+    .then(({token, oauthToken}) => {
+      return registerFCMTopic(config, firebaseConfig?.serverKey, token, oauthToken)
     })
-    .catch((err) => {
-      console.error(err);
-    });
+    .catch(err => {
+      console.error(err)
+    })
+}
+
+async function getToken (app, m, vapidKey) {
+  const messaging = m.getMessaging(app)
+  return vapidKey
+    ? m.getToken(messaging, {
+        vapidKey: vapidKey
+      })
+    : m.getToken(messaging)
+}
+
+async function getOAuthToken (a) {
+  const auth = a.getAuth() // Ensure Firebase is initialized
+  const user = auth.currentUser
+  console.log("user-------", user);
+  if (!user) {
+    console.error('User not signed in')
+    return
+  }
+
+  // Get the ID token from Firebase Auth
+  const idToken = await user.getIdToken()
+  console.log("idtoken--------", idToken);
+  return idToken
 }
 
-function registerFCMTopic(token) {
-  return fetch("/register-fcm-topic", {
-    method: "post",
-    headers: {
-      "Content-Type": "application/json",
-    },
-    body: JSON.stringify({ token: token }),
-  });
+async function registerFCMTopic (config, fcmServerKey, token, oauthToken) {
+  if (!token) {
+    console.error('No Token Found')
+    return
+  }
+
+  const serverKey = typeof fcmServerKey === 'function' ? await fcmServerKey(config) : fcmServerKey
+  console.log('serverKey-------', serverKey)
+  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`
+  try {
+    await fetch(url, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${oauthToken}`,
+        'content-type': 'application/json'
+      }
+    })
+    console.log('Registration Done Successfully')
+    return
+  } catch (error) {
+    console.error('FCM Subscription Failed', error)
+    return
+  }
 }

package/client/start.js

@@ -307,7 +307,7 @@ export function startApp(renderApplication, reducers, opts) {
         const mssgSenderId = fcm.messagingSenderId;
         const projectId = fcm.projectId;
         const apiKey = fcm.apiKey;
-        if (mssgSenderId && projectId && apiKey) initializeFCM(fcm);
+        if (mssgSenderId && projectId && apiKey) initializeFCM(fcm, page);
       }
     }
 

package/package.json

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

package/server/routes.js

@@ -22,7 +22,6 @@ const { handleManifest, handleAssetLink } = require('./handlers/json-manifest-ha
 const { redirectStory } = require('./handlers/story-redirect')
 const { simpleJsonHandler } = require('./handlers/simple-json-handler')
 const { makePickComponentSync } = require('../isomorphic/impl/make-pick-component-sync')
-const { registerFCMTopic } = require('./handlers/fcm-registration-handler')
 const { triggerWebengageNotifications } = require('./handlers/webengage-notifications')
 const rp = require('request-promise')
 const bodyParser = require('body-parser')
@@ -304,7 +303,6 @@ function getWithConfig (app, route, handler, opts = {}) {
  * @param {boolean|function} shouldEncodeAmpUri If set to true, then for every story-page request the slug will be encoded, in case of a vernacular slug this should be set to false. Receives path as param (default: true)
  * @param {number} sMaxAge Overrides the s-maxage value, the default value is set to 900 seconds. We can set `isomorphicRoutesSmaxage: 900` under `publisher` in publisher.yml config file that comes from BlackKnight or pass sMaxAge as a param.
  * @param {number} maxAge Overrides the max-age value, the default value is set to 15 seconds. We can set `isomorphicRoutesMaxage: 15` under `publisher` in publisher.yml config file that comes from BlackKnight or pass maxAge as a param.
- * @param {(string|function)} fcmServerKey  FCM serverKey is used for registering FCM Topic.
  * @param {string} appLoadingPlaceholder This string gets injected into the app container when the page is loaded via service worker. Can be used to show skeleton layouts, animations or other progress indicators before it is replaced by the page content.
  * @param {boolean|function} enableExternalStories If set to true, then for every request an external story api call is made and renders the story-page if the story is found. (default: false)
  * @param {string|function} externalIdPattern This string specifies the external id pattern the in the url. Mention `EXTERNAL_ID` to specify the position of external id in the url. Ex: "/parent-section/child-section/EXTERNAL_ID"
@@ -352,7 +350,6 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     sMaxAge = 900,
     maxAge = 15,
     appLoadingPlaceholder = '',
-    fcmServerKey = '',
     webengageConfig = {},
     externalIdPattern = '',
     enableExternalStories = false,
@@ -469,8 +466,6 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     })
   )
 
-  app.post('/register-fcm-topic', bodyParser.json(), withConfig(registerFCMTopic, { publisherConfig, fcmServerKey }))
-
   if (webengageConfig.enableWebengage) {
     app.post(
       '/integrations/webengage/trigger-notification',

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

@@ -1,38 +0,0 @@
-const { get } = require("lodash");
-const request = require("request-promise");
-
-exports.registerFCMTopic = async function registerFCM(
-  req,
-  res,
-  next,
-  { config, client, publisherConfig, fcmServerKey }
-) {
-  const token = get(req, ["body", "token"], null);
-  if (!token) {
-    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;
-  }
-};