@parse/push-adapter 6.1.0 → 6.1.1

package/lib/FCM.js

@@ -162,15 +162,20 @@ function _APNSToFCMPayload(requestData) {
         apnsPayload['apns']['payload']['aps'] = coreData.aps;
         break;
       case 'alert':
-        if (!apnsPayload['apns']['payload']['aps'].hasOwnProperty('alert')) {
+        if (_typeof(coreData.alert) == 'object') {
+          // When we receive a dictionary, use as is to remain
+          // compatible with how the APNS.js + node-apn work
+          apnsPayload['apns']['payload']['aps']['alert'] = coreData.alert;
+        } else {
+          // When we receive a value, prepare `alert` dictionary
+          // and set its `body` property
           apnsPayload['apns']['payload']['aps']['alert'] = {};
+          apnsPayload['apns']['payload']['aps']['alert']['body'] = coreData.alert;
         }
-        // In APNS.js we set a body with the same value as alert in requestData.
-        // See L200 in APNS.spec.js
-        apnsPayload['apns']['payload']['aps']['alert']['body'] = coreData.alert;
         break;
       case 'title':
         // Ensure the alert object exists before trying to assign the title
+        // title always goes into the nested `alert` dictionary
         if (!apnsPayload['apns']['payload']['aps'].hasOwnProperty('alert')) {
           apnsPayload['apns']['payload']['aps']['alert'] = {};
         }
@@ -217,7 +222,8 @@ function _APNSToFCMPayload(requestData) {
   return apnsPayload;
 }
 
-function _GCMToFCMPayload(requestData, timeStamp) {
+function _GCMToFCMPayload(requestData, pushId, timeStamp) {
+
   var androidPayload = {
     android: {
       priority: 'high'
@@ -257,7 +263,11 @@ function _GCMToFCMPayload(requestData, timeStamp) {
       }
     }
 
-    androidPayload.android.data = requestData.data;
+    androidPayload.android.data = {
+      push_id: pushId,
+      time: new Date(timeStamp).toISOString(),
+      data: JSON.stringify(requestData.data)
+    };
   }
 
   if (requestData['expiration_time']) {
@@ -283,10 +293,11 @@ function _GCMToFCMPayload(requestData, timeStamp) {
  * If the key rawPayload is present in the requestData, a raw payload will be used. Otherwise, conversion is done.
  * @param {Object} requestData The request body
  * @param {String} pushType Either apple or android.
- * @param {Number} timeStamp Used during GCM payload conversion for ttl
+ * @param {String} pushId Used during GCM payload conversion, required by Parse Android SDK.
+ * @param {Number} timeStamp Used during GCM payload conversion for ttl, required by Parse Android SDK.
  * @returns {Object} A FCMv1-compatible payload.
  */
-function payloadConverter(requestData, pushType, timeStamp) {
+function payloadConverter(requestData, pushType, pushId, timeStamp) {
   if (requestData.hasOwnProperty('rawPayload')) {
     return requestData.rawPayload;
   }
@@ -294,7 +305,7 @@ function payloadConverter(requestData, pushType, timeStamp) {
   if (pushType === 'apple') {
     return _APNSToFCMPayload(requestData);
   } else if (pushType === 'android') {
-    return _GCMToFCMPayload(requestData, timeStamp);
+    return _GCMToFCMPayload(requestData, pushId, timeStamp);
   } else {
     throw new _parse2.default.Error(_parse2.default.Error.PUSH_MISCONFIGURED, 'Unsupported push type, apple or android only.');
   }
@@ -313,12 +324,10 @@ function generateFCMPayload(requestData, pushId, timeStamp, deviceTokens, pushTy
   delete requestData['where'];
 
   var payloadToUse = {
-    data: {},
-    push_id: pushId,
-    time: new Date(timeStamp).toISOString()
+    data: {}
   };
 
-  var fcmPayload = payloadConverter(requestData, pushType, timeStamp);
+  var fcmPayload = payloadConverter(requestData, pushType, pushId, timeStamp);
   payloadToUse.data = _extends({}, fcmPayload, {
     tokens: deviceTokens
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parse/push-adapter",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Base parse-server-push-adapter",
   "main": "lib/index.js",
   "files": [
@@ -25,7 +25,7 @@
   "dependencies": {
     "@parse/node-apn": "6.0.1",
     "@parse/node-gcm": "1.0.2",
-    "firebase-admin": "12.0.0",
+    "firebase-admin": "12.1.0",
     "npmlog": "7.0.1",
     "parse": "5.0.0",
     "web-push": "3.6.7"