@quintype/framework 7.33.6-fcm-fix-2.18 → 7.33.6-jw-player.0

package/README.md

@@ -171,7 +171,7 @@ startApp(renderApplication,
 ```js
 isomorphicRoutes(app, {
   ...
-  fcmServiceCreds: (config) => <ServiceCreds> || fcmServiceCreds: <ServiceCreds> {(function|object)}
+  fcmServerKey: (config) => <ServerKey> || fcmServerKey: <ServerKey> {(function|string)}
   ...
 });
 

package/client/impl/fcm.js

@@ -20,7 +20,7 @@ export function initializeFCM(firebaseConfig) {
       return registerFCMTopic(token);
     })
     .catch((err) => {
-      console.error(`Fcm initialization error: ${err}`);
+      console.error(err);
     });
 }
 

package/client/start.js

@@ -17,6 +17,7 @@ import { IsomorphicComponent } from "../isomorphic/component";
 import { makePickComponentSync } from "../isomorphic/impl/make-pick-component-sync";
 import { createQtStore } from "../store/create-store";
 import { registerPageView, registerStoryShare, setMemberId, startAnalytics } from "./analytics";
+import { initializeFCM } from "./impl/fcm";
 import {
   checkForServiceWorkerUpdates,
   registerServiceWorker,
@@ -300,6 +301,16 @@ export function startApp(renderApplication, reducers, opts) {
 
     store.dispatch({ type: NAVIGATE_TO_PAGE, page, currentPath: path });
 
+    if (opts.firebaseConfig) {
+      const fcm = typeof opts.firebaseConfig === "function" ? opts.firebaseConfig(page) : opts.firebaseConfig;
+      if (fcm) {
+        const mssgSenderId = fcm.messagingSenderId;
+        const projectId = fcm.projectId;
+        const apiKey = fcm.apiKey;
+        if (mssgSenderId && projectId && apiKey) initializeFCM(fcm);
+      }
+    }
+
     const { config: { "theme-attributes": pageThemeAttributes = {} } = {} } = page;
     const version = pageThemeAttributes["cache-burst"] || app.getAppVersion();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.33.6-fcm-fix-2.18",
+  "version": "7.33.6-jw-player.0",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {
@@ -33,7 +33,7 @@
     "@ampproject/toolbox-optimizer": "2.8.3",
     "@grpc/grpc-js": "^1.12.5",
     "@jsdoc/salty": "^0.2.9",
-    "@quintype/amp": "^2.20.0",
+    "@quintype/amp": "^2.20.1-jw-player.0",
     "@quintype/backend": "^2.7.0",
     "@quintype/components": "^3.5.0",
     "@quintype/prerender-node": "^3.2.26",
@@ -45,8 +45,7 @@
     "compression": "^1.7.4",
     "ejs": "^3.1.6",
     "express": "^4.17.1",
-    "firebase": "^10.6.0",
-    "firebase-admin": "^13.1.0",
+    "firebase": "^9.6.10",
     "get-youtube-id": "^1.0.1",
     "http-proxy": "^1.18.1",
     "js-yaml": "^4.1.0",

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

@@ -1,33 +1,38 @@
-const { get } = require('lodash')
-const admin = require('firebase-admin')
-const logger = require('../logger')
+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, fcmServiceCreds }
+  { 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 = typeof fcmServiceCreds === 'function' ? await fcmServiceCreds(config) : fcmServiceCreds
+  const serverKey = typeof fcmServerKey === "function" ? await fcmServerKey(config) : fcmServerKey;
 
-  if (!admin.apps.length) {
-    admin.initializeApp({ credential: admin.credential.cert(serviceAccount) })
+  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 admin.messaging().subscribeToTopic(token, 'all')
-    res.status(200).send('Topic Registered Successfully')
-    return
+    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: ${error}`)
-    logger.error(`Fcm register to topic error: ${error}`)
-    return
+    res.status(500).send("FCM Subscription Failed");
+    return;
   }
-}
+};

package/server/routes.js

@@ -304,7 +304,7 @@ 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 {(object|function)} fcmServiceCreds  FCM service creds is used for registering FCM Topic.
+ * @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 +352,7 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     sMaxAge = 900,
     maxAge = 15,
     appLoadingPlaceholder = '',
-    fcmServiceCreds = {},
+    fcmServerKey = '',
     webengageConfig = {},
     externalIdPattern = '',
     enableExternalStories = false,
@@ -469,7 +469,7 @@ exports.isomorphicRoutes = function isomorphicRoutes (
     })
   )
 
-  app.post('/register-fcm-topic', bodyParser.json(), withConfig(registerFCMTopic, { publisherConfig, fcmServiceCreds }))
+  app.post('/register-fcm-topic', bodyParser.json(), withConfig(registerFCMTopic, { publisherConfig, fcmServerKey }))
 
   if (webengageConfig.enableWebengage) {
     app.post(