admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-3000-messaging-sockets-migrationv2 (pull request #1973)

Browse Source 
IO-3000 update firebase js version, and add back testing route.
This commit is contained in:
Patrick Fic
2024-11-28 19:41:05 +00:00
parent 73af18f287 43bf1fc8cf
commit cb46ee5700
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/public/firebase-messaging-sw.js
View File

@@ -1,6 +1,6 @@
// Scripts for firebase and firebase messaging // Scripts for firebase and firebase messaging
importScripts("https://www.gstatic.com/firebasejs/8.2.0/firebase-app.js"); importScripts("https://www.gstatic.com/firebasejs/10.14.1/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-messaging.js");
// Initialize the Firebase app in the service worker by passing the generated config // Initialize the Firebase app in the service worker by passing the generated config
let firebaseConfig; let firebaseConfig;

11
client/src/firebase/firebase.utils.js
View File

@@ -65,13 +65,10 @@ export const requestForToken = () => {
}); });
}; };
export const onMessageListener = () => onMessage(messaging, (payload) => {
new Promise((resolve) => { console.log("FCM Message received. ", payload);
onMessage(messaging, (payload) => { // ...
console.log("Inbound FCM Message", payload); });
resolve(payload);
});
});
export const logImEXEvent = (eventName, additionalParams, stateProp = null) => { export const logImEXEvent = (eventName, additionalParams, stateProp = null) => {
const state = stateProp || store.getState(); const state = stateProp || store.getState();

2
server/firebase/firebase-handler.js
View File

@@ -253,7 +253,7 @@ const sendNotification = async (req, res) => {
admin admin
.messaging() .messaging()
.send({ .send({
topic: "PRD_PATRICK-messaging", topic: req.body.topic,
notification: { notification: {
title: `ImEX Online Message - `, title: `ImEX Online Message - `,
body: "Test Noti." body: "Test Noti."

3
server/routes/notificationsRoutes.js
View File

@@ -1,11 +1,12 @@
const express = require("express"); const express = require("express");
const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware"); const validateFirebaseIdTokenMiddleware = require("../middleware/validateFirebaseIdTokenMiddleware");
const { subscribe, unsubscribe } = require("../firebase/firebase-handler"); const { subscribe, unsubscribe, sendNotification } = require("../firebase/firebase-handler");
const router = express.Router(); const router = express.Router();
router.use(validateFirebaseIdTokenMiddleware); router.use(validateFirebaseIdTokenMiddleware);
router.post("/subscribe", subscribe); router.post("/subscribe", subscribe);
router.post("/unsubscribe", unsubscribe); router.post("/unsubscribe", unsubscribe);
router.post("/sendtestnotification", sendNotification);
module.exports = router; module.exports = router;