@quintype/framework 7.33.6-fcm-fix-1.1 → 7.33.6-fcm-fix-1.3

package/package.json

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

package/server/handlers/fcm-registration-handler.js

@@ -29,33 +29,26 @@ exports.registerFCMTopic = async function registerFCM (
   })
 
   console.log('admin------', admin)
-  async function generateAccessToken () {
-    const token = await admin.credential.cert(fcmServiceAccountJson).getAccessToken()
-    console.log('OAuth2 Access Token:', token)
-    return token
-  }
-
-  const oauthToken = generateAccessToken()
-
-  if (!oauthToken) {
-    res.status(500).send('Oauth Token is not available')
-    return
-  }
-
-  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`
-  try {
-    await request({
-      uri: url,
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${oauthToken}`,
-        'content-type': 'application/json'
+  const oauthToken = await admin.credential
+    .cert(serviceAccount)
+    .getAccessToken()
+    .then(tokenObj => {
+      console.log('OAuth2 Access Token:', tokenObj)
+      if (tokenObj && tokenObj.access_token) {
+        return tokenObj.access_token
       }
     })
-    res.status(200).send('Registration Done Suceessfuly')
-    return
-  } catch (error) {
-    res.status(500).send('FCM Subscription Failed', error)
-    return
-  }
+    .catch(error => res.status(400).send(`Oauth Token is not available: ${error}`))
+
+  const url = `https://iid.googleapis.com/iid/v1/${token}/rel/topics/all`
+  await request({
+    uri: url,
+    method: 'POST',
+    headers: {
+      Authorization: `Bearer ${oauthToken}`,
+      'content-type': 'application/json'
+    }
+  })
+    .then(() => res.status(200).send('Registration Done Successfully'))
+    .catch(error => res.status(500).send(`FCM Subscription Failed: ${error}`))
 }