@quintype/framework 7.33.6-fcm-fix-1.4 → 7.33.6-fix-story-route.0

package/client/impl/fcm.js

@@ -1,7 +1,7 @@
-export function initializeFCM (firebaseConfig) {
+export function initializeFCM(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"),
   ])
     .then(([firebase, m]) => {
       const app = firebase.initializeApp({
@@ -10,30 +10,26 @@ export function initializeFCM (firebaseConfig) {
         apiKey: firebaseConfig.apiKey,
         storageBucket: firebaseConfig.storageBucket,
         authDomain: firebaseConfig.authDomain,
-        appId: firebaseConfig.appId
-      })
-      const messaging = m.getMessaging(app)
-      return firebaseConfig?.vapidKey
-        ? m.getToken(messaging, {
-            vapidKey: firebaseConfig.vapidKey
-          })
-        : m.getToken(messaging)
+        appId: firebaseConfig.appId,
+      });
+      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 => {
-      console.error(err)
+    .then((token) => {
+      return registerFCMTopic(token);
     })
+    .catch((err) => {
+      console.error(err);
+    });
 }
 
-function registerFCMTopic (token) {
-  return fetch('/register-fcm-topic', {
-    method: 'post',
+function registerFCMTopic(token) {
+  return fetch("/register-fcm-topic", {
+    method: "post",
     headers: {
-      'Content-Type': 'application/json'
+      "Content-Type": "application/json",
     },
-    body: JSON.stringify({ token: token })
-  })
+    body: JSON.stringify({ token: token }),
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.33.6-fcm-fix-1.4",
+  "version": "7.33.6-fix-story-route.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -46,7 +46,6 @@
     "ejs": "^3.1.6",
     "express": "^4.17.1",
     "firebase": "^9.6.10",
-    "firebase-admin": "^13.1.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,56 +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 }
 ) {
-  console.log('token======', token)
-  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',
-      access_token_auth: true
-    }
-  })
-    .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/handlers/isomorphic-handler.js

@@ -51,7 +51,9 @@ function loadDataForIsomorphicRoute(
     const redirectToLowercaseSlugsValue =
       typeof redirectToLowercaseSlugs === "function" ? redirectToLowercaseSlugs(config) : redirectToLowercaseSlugs;
     for (const match of matchAllRoutes(url.pathname, routes)) {
-      const params = Object.assign({}, url.query, otherParams, match.params);
+      const storyPath = (match.pageType === "story-page" && !match && !match.params && !match.params.storySlug) ? { storySlug: url.pathname } : {};
+      const params = Object.assign({}, url.query, otherParams, match.params, storyPath);
+
       /* On story pages, if the slug contains any capital letters (latin), we want to
        * redirect the browser to the URL having all lowercase letters. We need to be
        * wary of any asset routes that might make its way here and get wrongly redirected.

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(