@quintype/framework 7.33.6-fcm-fix.0 → 7.33.6-fcm-fix.1

package/client/impl/fcm.js

@@ -1,53 +1,79 @@
-export function initializeFCM(firebaseConfig, config) {
-  console.log("opts--------", firebaseConfig);
+export function initializeFCM (firebaseConfig, config) {
+  console.log('opts--------', firebaseConfig)
   Promise.all([
-    import(/* webpackChunkName: "firebase-app" */ "firebase/app"),
-    import(/* webpackChunkName: "firebase-messaging" */ "firebase/messaging"),
+    import(/* webpackChunkName: "firebase-app" */ 'firebase/app'),
+    import(/* webpackChunkName: "firebase-messaging" */ 'firebase/messaging'),
+    import(/* webpackChunkName: "firebase-auth" */ 'firebase/auth')
   ])
-    .then(([firebase, m]) => {
+    .then(([firebase, m, a]) => {
       const app = firebase.initializeApp({
         messagingSenderId: firebaseConfig.messagingSenderId.toString(),
         projectId: firebaseConfig.projectId,
         apiKey: firebaseConfig.apiKey,
         storageBucket: firebaseConfig.storageBucket,
         authDomain: firebaseConfig.authDomain,
-        appId: firebaseConfig.appId,
-      });
-      const messaging = m.getMessaging(app);
-      return firebaseConfig?.vapidKey ? m.getToken(messaging, {
-        vapidKey: `${firebaseConfig?.vapidKey}`
-      }) : m.getToken(messaging);
+        appId: firebaseConfig.appId
+      })
+      const token = getToken(app, m, firebaseConfig?.vapidKey)
+      console.log("final token----", token);
+      const oauthToken = getOAuthToken(a)
+      console.log("final oauthToken----", oauthToken);
+      return { token: token, oauthToken: oauthToken }
       // No need to refresh token https://github.com/firebase/firebase-js-sdk/issues/4132
     })
-    .then((token) => {
-      return registerFCMTopic(token, firebaseConfig.serverKey, config);
+    .then(({token, oauthToken}) => {
+      return registerFCMTopic(config, firebaseConfig?.serverKey, token, oauthToken)
     })
-    .catch((err) => {
-      console.error(err);
-    });
+    .catch(err => {
+      console.error(err)
+    })
+}
+
+async function getToken (app, m, vapidKey) {
+  const messaging = m.getMessaging(app)
+  return vapidKey
+    ? m.getToken(messaging, {
+        vapidKey: vapidKey
+      })
+    : m.getToken(messaging)
+}
+
+async function getOAuthToken (a) {
+  const auth = a.getAuth() // Ensure Firebase is initialized
+  const user = auth.currentUser
+  console.log("user-------", user);
+  if (!user) {
+    console.error('User not signed in')
+    return
+  }
+
+  // Get the ID token from Firebase Auth
+  const idToken = await user.getIdToken()
+  console.log("idtoken--------", idToken);
+  return idToken
 }
 
-async function registerFCMTopic(token, fcmServerKey, config) {
-    if (!token) {
-      console.error("No Token Found");
-      return;
-    }
+async function registerFCMTopic (config, fcmServerKey, token, oauthToken) {
+  if (!token) {
+    console.error('No Token Found')
+    return
+  }
 
-    const serverKey = typeof fcmServerKey === "function" ? await fcmServerKey(config) : fcmServerKey;
-    console.log("serverKey-------", serverKey);
-    const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`;
-    try {
-      await fetch(url, {
-        method: "POST",
-        headers: {
-          Authorization: `key=${serverKey}`,
-          "content-type": "application/json",
-        },
-      });
-      console.log("Registration Done Successfully");
-      return;
-    } catch (error) {
-      console.error("FCM Subscription Failed", error);
-      return;
-    }
-  };
+  const serverKey = typeof fcmServerKey === 'function' ? await fcmServerKey(config) : fcmServerKey
+  console.log('serverKey-------', serverKey)
+  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`
+  try {
+    await fetch(url, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${oauthToken}`,
+        'content-type': 'application/json'
+      }
+    })
+    console.log('Registration Done Successfully')
+    return
+  } catch (error) {
+    console.error('FCM Subscription Failed', error)
+    return
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quintype/framework",
-  "version": "7.33.6-fcm-fix.0",
+  "version": "7.33.6-fcm-fix.1",
   "description": "Libraries to help build Quintype Node.js apps",
   "main": "index.js",
   "engines": {