correcting some errors

Author: Schwobaland

package.json

@@ -33,9 +33,9 @@
     "nyc": "^10.1.2"
   },
   "dependencies": {
-    "apn": "^2.1.2",
+    "apn": "^2.1.3",
     "node-gcm": "^0.14.0",
-    "npmlog": "^2.0.3",
+    "npmlog": "^4.0.2",
     "parse": "^1.9.2"
   },
   "engines": {

spec/APNS.spec.js

@@ -5,11 +5,11 @@ describe('APNS', () => {
 
   it('can initialize with cert', (done) => {
     let args = {
-      cert: new Buffer('testCert'),
+      cert: '-----BEGIN CERTIFICATE-----fPEYJtQrEMXLC9JtFUJ6emXAWv2QdKu93QE+6o5htM+Eu/2oNFIEj2A71WUBu7kA-----END CERTIFICATE-----',
       key: new Buffer('testKey'),
       production: true,
       topic: 'topic'
-    }
+    };
     let apns = new APNS(args);
 
     expect(apns.providers.length).toBe(1);
@@ -99,6 +99,46 @@ describe('APNS', () => {
     done();
   });
 
+  it('can initialize with multiple certs', (done) => {
+    let args = [
+      {
+        cert: '-----BEGIN CERTIFICATE-----fPEYJtQrEMXLC9JtFUJ6emXAWv2QdKu93QE+6o5htM+Eu/2oNFIEj2A71WUBu7kA-----END CERTIFICATE-----',
+        key: new Buffer('testKey'),
+        production: false,
+        topic: 'topic'
+      },
+      {
+        cert: '-----BEGIN CERTIFICATE-----fPEYJtQrEMXLC9JtFUJ6emXAWv2QdKu93QE+6o5htM+Eu/2oNFIEj2A71WUBu7kA-----END CERTIFICATE-----',
+        key: new Buffer('testKey'),
+        production: true,
+        topic: 'topicAgain'
+      }
+    ];
+
+    let apns = new APNS(args);
+
+    expect(apns.providers.length).toBe(2);
+    let devApnsProvider = apns.providers[1];
+    expect(devApnsProvider.index).toBe(1);
+    expect(devApnsProvider.topic).toBe(args[0].topic);
+
+    let devApnsOptions = devApnsProvider.client.config;
+    expect(devApnsOptions.cert).toBe(args[0].cert);
+    expect(devApnsOptions.key).toBe(args[0].key);
+    expect(devApnsOptions.production).toBe(args[0].production);
+
+    let prodApnsProvider = apns.providers[0];
+    expect(prodApnsProvider.index).toBe(0);
+    expect(prodApnsProvider.topic).toBe(args[1].topic);
+
+    // TODO: Remove this checking onec we inject APNS
+    let prodApnsOptions = prodApnsProvider.client.config;
+    expect(prodApnsOptions.cert).toBe(args[1].cert);
+    expect(prodApnsOptions.key).toBe(args[1].key);
+    expect(prodApnsOptions.production).toBe(args[1].production);
+    done();
+  });
+
   it('can generate APNS notification', (done) => {
     //Mock request data
     let data = {
@@ -111,9 +151,9 @@ describe('APNS', () => {
       'key': 'value',
       'keyAgain': 'valueAgain'
     };
-    let expirationTime = 1454571491354
+    let expirationTime = 1454571491354;
 
-    let notification = APNS.prototype._generateNotification(data, expirationTime);
+    let notification = APNS._generateNotification(data, expirationTime);
 
     expect(notification.aps.alert).toEqual(data.alert);
     expect(notification.aps.badge).toEqual(data.badge);
@@ -141,7 +181,7 @@ describe('APNS', () => {
       }
     ];
 
-    let qualifiedProviders = APNS.prototype._chooseProviders.call({ providers: providers }, appIdentifier);
+    let qualifiedProviders = APNS.prototype._chooseProviders.call({providers: providers}, appIdentifier);
     expect(qualifiedProviders).toEqual([{
       topic: 'topic'
     }]);
@@ -160,7 +200,7 @@ describe('APNS', () => {
       }
     ];
 
-    let qualifiedProviders = APNS.prototype._chooseProviders.call({ providers: providers }, appIdentifier);
+    let qualifiedProviders = APNS.prototype._chooseProviders.call({providers: providers}, appIdentifier);
     expect(qualifiedProviders).toEqual([]);
     done();
   });
@@ -171,7 +211,7 @@ describe('APNS', () => {
       key: new Buffer('testKey'),
       production: true,
       topic: 'topic'
-    }
+    };
     let apns = new APNS(args);
     let provider = apns.providers[0];
     spyOn(provider, 'send').and.callFake((notification, devices) => {
@@ -181,13 +221,13 @@ describe('APNS', () => {
       })
     });
     // Mock data
-    let expirationTime = 1454571491354
+    let expirationTime = 1454571491354;
     let data = {
       'expiration_time': expirationTime,
       'data': {
         'alert': 'alert'
       }
-    }
+    };
     // Mock devices
     let mockedDevices = [
       {
@@ -248,13 +288,13 @@ describe('APNS', () => {
     });
     apns.providers = [provider, providerDev];
     // Mock data
-    let expirationTime = 1454571491354
+    let expirationTime = 1454571491354;
     let data = {
       'expiration_time': expirationTime,
       'data': {
         'alert': 'alert'
       }
-    }
+    };
     // Mock devices
     let mockedDevices = [
       {

src/APNS.js

@@ -21,6 +21,7 @@ export class APNS {
    * @param {String} args.passphrase The passphrase for the provider key, if required
    * @param {Boolean} args.production Specifies which environment to connect to: Production (if true) or Sandbox
    * @param {String} args.topic Specififies an App-Id for this Provider
+   * @param {String} args.bundleId DEPRECATED: Specifies an App-ID for this Provider
    * @param {Number} args.connectionRetryLimit  The maximum number of connection failures that will be tolerated before apn.Provider will "give up". (Defaults to: 3)
    */
   constructor(args = []) {
@@ -42,10 +43,11 @@ export class APNS {
 
       // rewrite bundleId to topic for backward-compatibility
       if (apnsArgs.bundleId) {
+        log.warn(LOG_PREFIX, 'bundleId is deprecated, use topic instead');
         apnsArgs.topic = apnsArgs.bundleId
       }
 
-      let provider = this._createProvider(apnsArgs);
+      let provider = APNS._createProvider(apnsArgs);
       this.providers.push(provider);
     }
 
@@ -62,9 +64,9 @@ export class APNS {
 
   /**
    * Send apns request.
-   * 
+   *
    * @param {Object} data The data we need to send, the format is the same with api request body
-   * @param {Array} devices An array of devices
+   * @param {Array} allDevices An array of devices
    * @returns {Object} A promise which is resolved immediately
    */
   send(data, allDevices) {
@@ -88,28 +90,28 @@ export class APNS {
 
       // No Providers found
       if (!providers || providers.length === 0) {
-        let errorPromises = devices.map(device => this._createErrorPromise(device.deviceToken, 'No Provider found'));
+        let errorPromises = devices.map(device => APNS._createErrorPromise(device.deviceToken, 'No Provider found'));
         allPromises = allPromises.concat(errorPromises);
         continue;
       }
 
-      let notification = this._generateNotification(coreData, expirationTime, appIdentifier);
+      let notification = APNS._generateNotification(coreData, expirationTime, appIdentifier);
       let promise = providers[0]
         .send(notification, devices.map(device => device.deviceToken))
         .then(this._handlePromise.bind(this));
       allPromises.push(promise);
-    };
+    }
 
     return Promise.all(allPromises);
   }
 
   /**
    * Creates an Provider base on apnsArgs.
    */
-  _createProvider(apnsArgs) {
+  static _createProvider(apnsArgs) {
     let provider = new apn.Provider(apnsArgs);
 
-    // if using certificate, then topic must be defined 
+    // if using certificate, then topic must be defined
     if ((apnsArgs.cert || apnsArgs.key || apnsArgs.pfx) && !apnsArgs.topic) {
       throw new Parse.Error(Parse.Error.PUSH_MISCONFIGURED, 'topic is mssing for %j', apnsArgs);
     }
@@ -134,7 +136,7 @@ export class APNS {
    * @param {String} topic Topic the Notification is sent to
    * @returns {Object} A apns Notification
    */
-  _generateNotification(coreData, expirationTime, topic) {
+  static _generateNotification(coreData, expirationTime, topic) {
     let notification = new apn.Notification();
     let payload = {};
     for (let key in coreData) {
@@ -172,9 +174,9 @@ export class APNS {
 
   /**
    * Choose appropriate providers based on device appIdentifier.
-   * 
+   *
    * @param {String} appIdentifier appIdentifier for required provider
-   * @returns Returns Array with appropriate providers
+   * @returns {Array} Returns Array with appropriate providers
    */
   _chooseProviders(appIdentifier) {
     // If the device we need to send to does not have appIdentifier, any provider could be a qualified provider
@@ -195,28 +197,30 @@ export class APNS {
   }
 
   _handlePromise(response) {
+    let promises = [];
     response.sent.forEach((token) => {
-      log.verbose(LOG_PREFIX, 'APNS transmitted to %s', token);
-      return this._createSuccesfullPromise(token);
+      log.verbose(LOG_PREFIX, 'APNS transmitted to %s', token.device);
+      promises.push(APNS._createSuccesfullPromise(token.device));
     });
     response.failed.forEach((failure) => {
       if (failure.error) {
         log.error(LOG_PREFIX, 'APNS error transmitting to device %s with error %s', failure.device, failure.error);
-        return this._createErrorPromise(failure.device, failure.error);
+        promises.push(PNS._createErrorPromise(failure.device, failure.error));
       } else if (failure.status && failure.response && failure.response.reason) {
         log.error(LOG_PREFIX, 'APNS error transmitting to device %s with status %s and reason %s', failure.device, failure.status, failure.response.reason);
-        return this._createErrorPromise(failure.device, failure.response.reason);
+        promises.push(APNS._createErrorPromise(failure.device, failure.response.reason));
       }
     });
+    return Promise.all(promises);
   }
 
   /**
    * Creates an errorPromise for return.
-   * 
+   *
    * @param {String} token Device-Token
    * @param {String} errorMessage ErrrorMessage as string
    */
-  _createErrorPromise(token, errorMessage) {
+  static _createErrorPromise(token, errorMessage) {
     return Promise.resolve({
       transmitted: false,
       device: {
@@ -229,10 +233,10 @@ export class APNS {
 
   /**
    * Creates an successfulPromise for return.
-   * 
+   *
    * @param {String} token Device-Token
    */
-  _createSuccesfullPromise(token) {
+  static _createSuccesfullPromise(token) {
     return Promise.resolve({
       transmitted: true,
       device: {