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

Fixed firebase production issues. Mismatched vapid key + caching.

Browse Source
This commit is contained in:
Patrick Fic
2020-05-06 20:00:16 -07:00
parent 61baf30052
commit 9d4b36aeec
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,15 +3,26 @@ importScripts(
"https://www.gstatic.com/firebasejs/7.14.2/firebase-messaging.js" "https://www.gstatic.com/firebasejs/7.14.2/firebase-messaging.js"
); );
// firebase.initializeApp({
// apiKey: "AIzaSyDSezy-jGJreo7ulgpLdlpOwAOrgcaEkhU",
// authDomain: "imex-prod.firebaseapp.com",
// databaseURL: "https://imex-prod.firebaseio.com",
// projectId: "imex-prod",
// storageBucket: "imex-prod.appspot.com",
// messagingSenderId: "253497221485",
// appId: "1:253497221485:web:3c81c483b94db84b227a64",
// measurementId: "G-NTWBKG2L0M",
// });
firebase.initializeApp({ firebase.initializeApp({
apiKey: "AIzaSyDV9MsSHZmpLtjoaTK_ObvjFaJ-nMSd2KA", apiKey: "AIzaSyDPLT8GiDHDR1R4nI66Qi0BY1aYviDPioc",
authDomain: "bodyshop-dev-b1cb6.firebaseapp.com", authDomain: "imex-dev.firebaseapp.com",
databaseURL: "https://bodyshop-dev-b1cb6.firebaseio.com", databaseURL: "https://imex-dev.firebaseio.com",
projectId: "bodyshop-dev-b1cb6", projectId: "imex-dev",
storageBucket: "bodyshop-dev-b1cb6.appspot.com", storageBucket: "imex-dev.appspot.com",
messagingSenderId: "922785209028", messagingSenderId: "759548147434",
appId: "1:922785209028:web:96e9df15401eee5d784791", appId: "1:759548147434:web:e8239868a48ceb36700993",
measurementId: "G-2D5378VCHE", measurementId: "G-K5XRBVVB4S",
}); });
const messaging = firebase.messaging(); const messaging = firebase.messaging();

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

@@ -6,6 +6,7 @@ import "firebase/analytics";
import "firebase/messaging"; import "firebase/messaging";
const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG); const config = JSON.parse(process.env.REACT_APP_FIREBASE_CONFIG);
console.log("Firebase config", config);
firebase.initializeApp(config); firebase.initializeApp(config);
export const auth = firebase.auth(); export const auth = firebase.auth();
@@ -37,11 +38,13 @@ export const updateCurrentUser = (userDetails) => {
let messaging; let messaging;
try { try {
messaging = firebase.messaging(); messaging = firebase.messaging();
messaging.usePublicVapidKey( // Project Settings => Cloud Messaging => Web Push certificates
// Project Settings => Cloud Messaging => Web Push certificates // messaging.usePublicVapidKey(process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY);
messaging.usePublicVapidKey(process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY);
console.log(
"Firebase Messaging initialized successfully.",
process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY process.env.REACT_APP_FIREBASE_PUBLIC_VAPID_KEY
); );
console.log("Firebase Messaging initialized successfully.");
} catch { } catch {
console.log("Firebase Messaging is likely unsupported."); console.log("Firebase Messaging is likely unsupported.");
} }

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

@@ -2,12 +2,6 @@ var admin = require("firebase-admin");
const path = require("path"); const path = require("path");
require("dotenv").config({ path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || 'development'}`) }); require("dotenv").config({ path: path.resolve(process.cwd(), `.env.${process.env.NODE_ENV || 'development'}`) });
console.log(
"Found Firebase AdminSDK JSON",
process.env.NODE_ENV,
!!process.env.FIREBASE_ADMINSDK_JSON
);
var serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON); var serviceAccount = require(process.env.FIREBASE_ADMINSDK_JSON);
admin.initializeApp({ admin.initializeApp({