Fix formatting

Author: alex-friedl

README.md

@@ -531,13 +531,16 @@ const silentPushData = {
 ```
 
 ## FCM
+
 The following parameters are used to create an FCM message (Android/APN):
 [node-gcm](https://github.com/ToothlessGear/node-gcm) lib for `GCM` method use old firebase api (will be [deprecated ](https://firebase.google.com/docs/cloud-messaging/migrate-v1?hl=en&authuser=0))
 Settings:
+
 - `settings.fcm.appName` [firebase app name](https://firebase.google.com/docs/reference/admin/node/firebase-admin.app.app#appname) (required)
 - `settings.fcm.serviceAccountKey` [firebase service account file](https://firebase.google.com/docs/admin/setup#initialize_the_sdk_in_non-google_environments) use downloaded 'service-account-file.json'
 - `settings.fcm.credential` [firebase credential](https://firebase.google.com/docs/reference/admin/node/firebase-admin.app.credential)
-Note: one of `serviceAccountKey`, `credential` fcm options is required
+  Note: one of `serviceAccountKey`, `credential` fcm options is required
+
 ```js
 const tokens = [
   'e..Gwso:APA91.......7r910HljzGUVS_f...kbyIFk2sK6......D2s6XZWn2E21x',
@@ -576,11 +579,15 @@ pushNotifications.send(tokens, notifications, (error, result) => {
   }
 });
 ```
+
 `fcm_notification` - object that will be passed to
+
 ```js
   new gcm.Message({ ..., notification: data.fcm_notification })
 ```
+
 Fcm object that will be sent to provider ([Fcm message format](https://firebase.google.com/docs/reference/fcm/rest/v1/projects.messages?authuser=0#Message)) :
+
 ```json
 {
   "data": {

src/constants.js

@@ -71,6 +71,6 @@ module.exports = {
       // contentEncoding: '< Encoding type, e.g.: aesgcm or aes128gcm >'
     },
     isAlwaysUseFCM: false,
-    isLegacyGCM: false
+    isLegacyGCM: false,
   },
 };

src/push-notifications.js

@@ -21,7 +21,9 @@ import {
 class PN {
   constructor(options) {
     this.setOptions(options);
-    this.useFcmOrGcmMethod = this.settings.isLegacyGCM ? GCM_METHOD : FCM_METHOD;
+    this.useFcmOrGcmMethod = this.settings.isLegacyGCM
+      ? GCM_METHOD
+      : FCM_METHOD;
   }
 
   setOptions(opts) {

src/sendFCM.js

@@ -2,9 +2,7 @@ const firebaseAdmin = require('firebase-admin');
 
 const { FCM_METHOD } = require('./constants');
 const FcmMessage = require('./utils/fcmMessage');
-const {
-  containsValidRecipients,
-} = require('./utils/tools');
+const { containsValidRecipients } = require('./utils/tools');
 
 const getRecipientList = (obj) => {
   if (obj.tokens) {
@@ -19,7 +17,7 @@ const getRecipientList = (obj) => {
   if (obj.topic) {
     return [obj.topic];
   }
-}
+};
 
 const sendChunk = (firebaseApp, recipients, message) => {
   const firebaseMessage = message.buildWithRecipients(recipients);
@@ -128,4 +126,4 @@ const sendFCM = (regIds, data, settings) => {
   });
 };
 
-module.exports = sendFCM;
+module.exports = sendFCM;

src/sendGCM.js

@@ -1,9 +1,6 @@
 const gcm = require('node-gcm');
 const { GCM_METHOD } = require('./constants');
-const {
-  containsValidRecipients,
-  buildGcmMessage,
-} = require('./utils/tools');
+const { containsValidRecipients, buildGcmMessage } = require('./utils/tools');
 
 const getRecipientList = (obj) => {
   if (obj.registrationTokens) {
@@ -15,7 +12,7 @@ const getRecipientList = (obj) => {
   if (obj.condition) {
     return [obj.condition];
   }
-}
+};
 
 const sendChunk = (GCMSender, recipients, message, retries) =>
   new Promise((resolve) => {
@@ -79,7 +76,7 @@ const sendGCM = (regIds, data, settings) => {
   const promises = [];
 
   const message = buildGcmMessage(data, opts);
-  
+
   let chunk = 0;
 
   /* allow to override device tokens with custom `to` or `condition` field:

src/utils/fcmMessage.js

@@ -79,4 +79,4 @@ class FcmMessage {
   }
 }
 
-module.exports = FcmMessage;
+module.exports = FcmMessage;

src/utils/tools.js

@@ -30,9 +30,8 @@ const extractExpiry = R.cond([
 const getPropValueOrUndefinedIfIsSilent = (propName, data) => {
   if (data.silent) {
     return undefined;
-  }
-  else return data[propName];
-}
+  } else return data[propName];
+};
 
 const toJSONorUndefined = R.when(
   R.is(String),
@@ -142,7 +141,7 @@ const buildGcmMessage = (data, options) => {
 };
 
 const buildApnsMessage = (data) => {
-  console.log('data', data)
+  console.log('data', data);
   const message = new ApnsMessage({
     retryLimit: data.retries || -1,
     expiry: extractExpiry(data),
@@ -166,7 +165,7 @@ const buildApnsMessage = (data) => {
     threadId: data.threadId,
     pushType: data.pushType,
   });
-  console.log('message', message)
+  console.log('message', message);
 
   if (data.rawPayload) {
     message.rawPayload = data.rawPayload;
@@ -183,4 +182,4 @@ module.exports = {
 
   buildApnsMessage,
   buildGcmMessage,
-};
+};

test/push-notifications/basic.js

@@ -43,9 +43,9 @@ describe('push-notifications: instantiation and class properties', () => {
       },
       fcm: {
         name: 'testAppName',
-        serviceAccountKey: require(path.resolve(
-          'test/send/FCM-service-account-key.json'
-        )),
+        serviceAccountKey: require(
+          path.resolve('test/send/FCM-service-account-key.json')
+        ),
       },
       apn: {
         token: {
@@ -251,9 +251,9 @@ describe('push-notifications: instantiation and class properties', () => {
       const settings = {
         fcm: {
           name: 'testAppName',
-          serviceAccountKey: require(path.resolve(
-            'test/send/FCM-service-account-key.json'
-          )),
+          serviceAccountKey: require(
+            path.resolve('test/send/FCM-service-account-key.json')
+          ),
         },
         isLegacyGCM: false,
       };

test/send/FCM-service-account-key.json

@@ -1,13 +1,13 @@
 {
-    "type": "service_account",
-    "project_id": "tjkfdgkj-sfggtht-sdf",
-    "private_key_id": "45674567rtgweryer65u45687ws",
-    "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgZQKBgH3+\nYwwi1GLdC7gliFyczOt2x/LC1PFhtk2K5h2CbMZVUYO0SvTjr/E5MWDra+eKLxdO\nPPcJgipS4lYeziJMCgRD9LiY4xeuUcdt1eR\n+xqoGPVTftTZiSyplhpdABcO9B7mrOxBTf6sX4tJAoGBANq/G9uy4rQ2JwcdX7Aq\nVykfyOrirjuA+oAH7m9bnnrvLFZavvz3tlWAxgmu+3zjXdD0pbLsn7mePBmLVAdh\n28I2dHj0BAZHd95Hnn+X1tJU26+v7SAtzQjQhskEbAXrPJ8rFyhL6RrswNrzJt0f\ntDV27cmQkzhvIDIvof4f97W+\n-----END PRIVATE KEY-----\n",
-    "client_email": "firebase-adminsdk-p7o1d@jkfdgkj-sfggtht-sdf.iam.gserviceaccount.com",
-    "client_id": "5475678568568568568",
-    "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-    "token_uri": "https://oauth2.googleapis.com/token",
-    "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-    "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-p7o1d%40agr-sdfg-gafdsarg.iam.gserviceaccount.com",
-    "universe_domain": "googleapis.com"
-  }
+  "type": "service_account",
+  "project_id": "tjkfdgkj-sfggtht-sdf",
+  "private_key_id": "45674567rtgweryer65u45687ws",
+  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgZQKBgH3+\nYwwi1GLdC7gliFyczOt2x/LC1PFhtk2K5h2CbMZVUYO0SvTjr/E5MWDra+eKLxdO\nPPcJgipS4lYeziJMCgRD9LiY4xeuUcdt1eR\n+xqoGPVTftTZiSyplhpdABcO9B7mrOxBTf6sX4tJAoGBANq/G9uy4rQ2JwcdX7Aq\nVykfyOrirjuA+oAH7m9bnnrvLFZavvz3tlWAxgmu+3zjXdD0pbLsn7mePBmLVAdh\n28I2dHj0BAZHd95Hnn+X1tJU26+v7SAtzQjQhskEbAXrPJ8rFyhL6RrswNrzJt0f\ntDV27cmQkzhvIDIvof4f97W+\n-----END PRIVATE KEY-----\n",
+  "client_email": "firebase-adminsdk-p7o1d@jkfdgkj-sfggtht-sdf.iam.gserviceaccount.com",
+  "client_id": "5475678568568568568",
+  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
+  "token_uri": "https://oauth2.googleapis.com/token",
+  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
+  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/firebase-adminsdk-p7o1d%40agr-sdfg-gafdsarg.iam.gserviceaccount.com",
+  "universe_domain": "googleapis.com"
+}

test/send/sendFCM.js

@@ -79,4 +79,4 @@ describe('push-notifications-fcm', () => {
         .catch(done);
     });
   });
-});
+});