From 43bf1fc8cf980d1d1453aa690f0230af1c5d4e5d Mon Sep 17 00:00:00 2001
From: Patrick Fic <patrick@thinkimex.com>
Date: Thu, 28 Nov 2024 11:39:17 -0800
Subject: [PATCH] IO-3000 update firebase js version, and add back testing
 route.

---
 client/public/firebase-messaging-sw.js |  4 ++--
 client/src/firebase/firebase.utils.js  | 11 ++++-------
 server/firebase/firebase-handler.js    |  2 +-
 server/routes/notificationsRoutes.js   |  3 ++-
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/client/public/firebase-messaging-sw.js b/client/public/firebase-messaging-sw.js
index 76f0a52f9..69bf1315f 100644
--- a/client/public/firebase-messaging-sw.js
+++ b/client/public/firebase-messaging-sw.js
@@ -1,6 +1,6 @@
 // Scripts for firebase and firebase messaging
-importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js");
-importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-messaging.js");
+importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-app.js");
+importScripts("https://www.gstatic.com/firebasejs/10.14.1/firebase-messaging.js");
 
 // Initialize the Firebase app in the service worker by passing the generated config
 let firebaseConfig;
diff --git a/client/src/firebase/firebase.utils.js b/client/src/firebase/firebase.utils.js
index 33da2eeac..9a7225b6d 100644
--- a/client/src/firebase/firebase.utils.js
+++ b/client/src/firebase/firebase.utils.js
@@ -65,13 +65,10 @@ export const requestForToken = () => {
     });
 };
 
-export const onMessageListener = () =>
-  new Promise((resolve) => {
-    onMessage(messaging, (payload) => {
-      console.log("Inbound FCM Message", payload);
-      resolve(payload);
-    });
-  });
+onMessage(messaging, (payload) => {
+  console.log("FCM Message received. ", payload);
+  // ...
+});
 
 export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
   const state = stateProp || store.getState();
diff --git a/server/firebase/firebase-handler.js b/server/firebase/firebase-handler.js
index e24c86174..6cd952783 100644
--- a/server/firebase/firebase-handler.js
+++ b/server/firebase/firebase-handler.js
@@ -253,7 +253,7 @@ const sendNotification = async (req, res) => {
     admin
       .messaging()
       .send({
-        topic: "PRD_PATRICK-messaging",
+        topic: req.body.topic,
         notification: {
           title: `ImEX Online Message - `,
           body: "Test Noti."
diff --git a/server/routes/notificationsRoutes.js b/server/routes/notificationsRoutes.js
index 641143f0d..cd31b7172 100644
--- a/server/routes/notificationsRoutes.js
+++ b/server/routes/notificationsRoutes.js
@@ -1,11 +1,12 @@
 const express = require("express");
 const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
-const { subscribe, unsubscribe } = require("../firebase/firebase-handler");
+const { subscribe, unsubscribe, sendNotification } = require("../firebase/firebase-handler");
 const router = express.Router();
 
 router.use(validateFirebaseIdTokenMiddleware);
 
 router.post("/subscribe", subscribe);
 router.post("/unsubscribe", unsubscribe);
+router.post("/sendtestnotification", sendNotification);
 
 module.exports = router;