@quintype/framework 7.33.6-fcm-fix-2.13 → 7.33.6-fcm-fix-2.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/server/handlers/fcm-registration-handler.js +17 -24
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@quintype/framework",
3
- "version": "7.33.6-fcm-fix-2.13",
3
+ "version": "7.33.6-fcm-fix-2.14",
4
4
  "description": "Libraries to help build Quintype Node.js apps",
5
5
  "main": "index.js",
6
6
  "engines": {
package/server/handlers/fcm-registration-handler.js CHANGED
@@ -14,34 +14,27 @@ exports.registerFCMTopic = async function registerFCM (
14
14
  return
15
15
  }
16
16
 
17
- const serviceJson = {
18
- "type": "service_account",
19
- "project_id": "quintypeqa-d3e3f",
20
- "private_key_id": "4ea922d1ecf4ff6cbf08cd2b0ff0208ed79bae4d",
21
- "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC6yNeTiXFdRXBd\nXV7FDolHJFVM08l8xceihVuP4sZ07LR9FJwuLG5YCr5x1DfICf3Ezj3OPBJgo50f\n6amclTX/O9B/PZcs/cKRNrHjLzU1EL+zSdJfssjHhRLh3ExvWMbqEvVyXMoVmRUJ\nPMeBo9i0x4T8VrHuqYzLzq+PboUj+o0TIZjCVRgvuh/Ge7apmRjR7shaHFy9vkPC\nrDa3Xfnl8vWhr8T2B2/pEUmMwYrgWZpHQmGnMyIwjVyauucFHTtmhzsvXrdXio5v\nqgoEimtF4+IMuTZL8VFIivi34Cghe9k6Ki14PbGJBYwsolpbQ8Jo8+VS+SHWx6Pb\ngs3hbmTfAgMBAAECggEAAt2IFZ2w6wPPuE1X4fARcvwbZ0jhYbQgfJTvNXuPvtIK\n53D6/7TeLwJxUUYuDQTYWjE+1BQQ1htJPVe4zNAIxUHA0Fv0Jz7nUvhcZRuSyZ3H\nQolYAr03nklFn3ML4HabFT1xSCVYDtFcqya1cTIMbm+pQLO8Kvnxe49P+QRY/FLZ\nwX9gpF+tlqZrf+clGer43Vwxr78Z8K5akXEVuJ8IIisr+tg5iK3zmG6eeI0Yrr9K\nw4HRDrymKFKSg7bjPKRHvJDnfZJ9HTGf1tjlJWGzaNMK7rZgJRFABSvOT5/1/cmH\n674D4wYuA6BB1ZdfMqyZwCliRlUCdmav/3JKrICVIQKBgQD+5O2Kx/hhWD3R/j16\nAOc44hpxRRbP3HdmuXybIpNFiGHMSKWpSPnaEjmQQOqlemaicbrgT0J/k8/qQ3HU\nEkoyTY2CqIwgmKTVWcrL9RiWQm5uTOgFCWpRBg7jC4GnQFxomoWp7FkFiFxeoRX1\niwWQg317KXqNPvbMT8H6GkEZIQKBgQC7mEZwAd5kRh8lcUQVf1Cvg6nFQpqqxRt+\nzBPR15GVt0xscIYlQfMPEwr2utwFyPUAnFXNIl80+5mx9dQDsm6DA0UyXcOWANIX\nP2TeBuk3Cn2I9pQKVRvAp8VwzH57NK3p7ehkSNB4Phx4FLnzUe/HSE1vVegRZzO3\nZwvWTOm9/wKBgHqgVitjIvpqAmvJXXgZgSPbmw8NRvk/Pm48JFdaHfHgt/QYqyIz\nCojAJdNhd8GejkvuXRJW704DJY61XcjB99IVf1PxlGCGLx65MRhIVMjNMuV7uE/c\nBLrwKC9QtNJq40ortMxX+UfxH0cjRjY36Lhqme6ruNrFBOSsJk0VXmYhAoGBAK9s\nfWnehX3ViOi1m4pSzTvj7o01dHb+7XBMHLidUlnj18aMDxWmL0nIb/c70+Zg/qM8\njovOeaONKDOfg0yVvfwrwbiQsAaE6/GraYKqicnbuHqswtFKtzIYcWzC/f/uyjc4\nL5of8TqQMoUkNKNR2tzLQwY7GlGz5Uu7Q/l5YRc3AoGAHLo8Nl36+FbCan+mK//f\nSjkcaDxyq3ouiENsVtJDHsB7NpsZD6JZ1kRTIzlt6Sx0Pd91dQDr0D/AVEHjevka\ns8FnLu5o9gSAGX0MVi+u+Ti3K4fb2TDaJMIH3B4SGx4NdNsSlw+kqklfZb3zDyPh\n0gDMhA+h+QJSyy2a1ggfpjQ=\n-----END PRIVATE KEY-----\n",
22
- "client_email": "firebase-adminsdk-fbsvc@quintypeqa-d3e3f.iam.gserviceaccount.com",
23
- "client_id": "104205441223663960831",
24
- "auth_uri": "https://accounts.google.com/o/oauth2/auth",
25
- "token_uri": "https://oauth2.googleapis.com/token",
26
- "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
27
- "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-fbsvc%40quintypeqa-d3e3f.iam.gserviceaccount.com",
28
- "universe_domain": "googleapis.com"
29
- }
17
+ const serviceAccount = typeof fcmServerKey === 'function' ? await fcmServerKey(config) : fcmServerKey
18
+ console.log('fcmServerKey=====', serviceAccount)
19
+ console.log('client=', client)
20
+ console.log('admin.apps.length', admin.apps.length)
30
21
 
31
- console.log("client=", client);
32
- console.log("admin.apps.length", admin.apps.length);
22
+ console.log('client=', client)
23
+ console.log('admin.apps.length', admin.apps.length)
33
24
 
34
- if (!admin.apps.length) { admin.initializeApp({ credential: admin.credential.cert(serviceJson), }); }
25
+ if (!admin.apps.length) {
26
+ admin.initializeApp({ credential: admin.credential.cert(serviceAccount) })
27
+ }
35
28
 
36
- console.log("admin-----", admin)
29
+ console.log('admin-----', admin)
37
30
  try {
38
- const data = await admin.messaging().subscribeToTopic(token, "all");
39
- console.log(`Successfully subscribed to topic----: ${data}`);
40
- res.status(200).send(`Registration Done Successfully ${data}`);
41
- return;
31
+ const data = await admin.messaging().subscribeToTopic(token, 'all')
32
+ console.log(`Successfully subscribed to topic----: ${data}`)
33
+ res.status(200).send(`Registration Done Successfully ${data}`)
34
+ return
42
35
  } catch (error) {
43
- console.error("Error subscribing to topic----:", error);
44
- res.status(500).send(`FCM Subscription Failed: ${error}`);
45
- return;
36
+ console.error('Error subscribing to topic----:', error)
37
+ res.status(500).send(`FCM Subscription Failed: ${error}`)
38
+ return
46
39
  }
47
40
  }