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

IO-3000 Add back FCM notification subscribe

Browse Source
This commit is contained in:
Patrick Fic
2024-11-28 11:05:50 -08:00
parent db5740d487
commit 90f4977924
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ switch (this.location.hostname) {
storageBucket: "imex-dev.appspot.com", storageBucket: "imex-dev.appspot.com",
messagingSenderId: "759548147434", messagingSenderId: "759548147434",
appId: "1:759548147434:web:e8239868a48ceb36700993", appId: "1:759548147434:web:e8239868a48ceb36700993",
measurementId: "G-K5XRBVVB4S", measurementId: "G-K5XRBVVB4S"
}; };
break; break;
case "test.imex.online": case "test.imex.online":
@@ -24,7 +24,7 @@ switch (this.location.hostname) {
projectId: "imex-test", projectId: "imex-test",
storageBucket: "imex-test.appspot.com", storageBucket: "imex-test.appspot.com",
messagingSenderId: "991923618608", messagingSenderId: "991923618608",
appId: "1:991923618608:web:633437569cdad78299bef5", appId: "1:991923618608:web:633437569cdad78299bef5"
// measurementId: "${config.measurementId}", // measurementId: "${config.measurementId}",
}; };
break; break;
@@ -38,7 +38,7 @@ switch (this.location.hostname) {
storageBucket: "imex-prod.appspot.com", storageBucket: "imex-prod.appspot.com",
messagingSenderId: "253497221485", messagingSenderId: "253497221485",
appId: "1:253497221485:web:3c81c483b94db84b227a64", appId: "1:253497221485:web:3c81c483b94db84b227a64",
measurementId: "G-NTWBKG2L0M", measurementId: "G-NTWBKG2L0M"
}; };
} }
@@ -49,8 +49,6 @@ const messaging = firebase.messaging();
messaging.onBackgroundMessage(function (payload) { messaging.onBackgroundMessage(function (payload) {
// Customize notification here // Customize notification here
const channel = new BroadcastChannel("imex-sw-messages"); console.log("[firebase-messaging-sw.js] Received background message ", payload);
channel.postMessage(payload); self.registration.showNotification(notificationTitle, notificationOptions);
//self.registration.showNotification(notificationTitle, notificationOptions);
}); });

22
client/src/components/chat-affix/chat-affix.container.jsx
View File

@@ -1,9 +1,12 @@
import { useApolloClient } from "@apollo/client"; import { useApolloClient } from "@apollo/client";
import { getToken } from "@firebase/messaging";
import axios from "axios";
import React, { useContext, useEffect } from "react"; import React, { useContext, useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import SocketContext from "../../contexts/SocketIO/socketContext";
import { messaging, requestForToken } from "../../firebase/firebase.utils";
import ChatPopupComponent from "../chat-popup/chat-popup.component"; import ChatPopupComponent from "../chat-popup/chat-popup.component";
import "./chat-affix.styles.scss"; import "./chat-affix.styles.scss";
import SocketContext from "../../contexts/SocketIO/socketContext";
import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers"; import { registerMessagingHandlers, unregisterMessagingHandlers } from "./registerMessagingSocketHandlers";
export function ChatAffixContainer({ bodyshop, chatVisible }) { export function ChatAffixContainer({ bodyshop, chatVisible }) {
@@ -14,6 +17,23 @@ export function ChatAffixContainer({ bodyshop, chatVisible }) {
useEffect(() => { useEffect(() => {
if (!bodyshop || !bodyshop.messagingservicesid) return; if (!bodyshop || !bodyshop.messagingservicesid) return;
async function SubscribeToTopicForFCMNotification() {
try {
await requestForToken();
await axios.post("/notifications/subscribe", {
fcm_tokens: await getToken(messaging, {
vapidKey: import.meta.env.VITE_APP_FIREBASE_PUBLIC_VAPID_KEY
}),
type: "messaging",
imexshopid: bodyshop.imexshopid
});
} catch (error) {
console.log("Error attempting to subscribe to messaging topic: ", error);
}
}
SubscribeToTopicForFCMNotification();
//Register WS handlers //Register WS handlers
if (socket && socket.connected) { if (socket && socket.connected) {
registerMessagingHandlers({ socket, client }); registerMessagingHandlers({ socket, client });