Merge pull request #6 from Sadia-Alauddin/setupIOSClient

fixed iOS client setup function

Author: mideveloper

.gitignore

@@ -1,3 +1,5 @@
+
+/.idea
 # Logs
 logs
 *.log

index.js

@@ -14,10 +14,9 @@ function onTransmissionError(ctx, client, errorCode, notificationObj, recipient)
     ctx.onTransmissionError(client, errorCode, notificationObj, recipient);
 }
 
-Notification.prototype.setupIOSClient = function setupIOSClient(
-    dev_key_path, dev_cert_path, prod_key_path, prod_cert_path, prod_pass_phrase, stg_pass_phrase) {
+Notification.prototype.setupIOSClient = function setupIOSClient(key, cert, pass_phrase, sandbox) {
     var self = this;
-    self.clients.ios = new Ios(dev_key_path, dev_cert_path, prod_key_path, prod_cert_path, prod_pass_phrase, stg_pass_phrase);
+    self.clients.ios = new Ios(key, cert, pass_phrase, sandbox);
     self.clients.ios.onTransmitted = function (client, notificationObj, recipient) {
         onTransmitted(self, client, notificationObj, recipient);
     };

lib/ios.js

@@ -217,31 +217,14 @@ var initApnFeedback = function initApnFeedback(ctx, options) {
 var initApnSend = function initApnSend(ctx) {
     //if apn connection is undefined (on the very first connect or may be drain or disconnect
     if (!ctx.apn_connection) {
-        var options = {};
-        if (global.Environment === "production") {
-            options = {
-                "key": ctx.apn.prod_key,
-                "cert": ctx.apn.prod_cert,
-                "interval": 43200,
-                "batchFeedback": true,
-                "production": true
-            };
-            if(ctx.apn.prod_pass_phrase) {
-                options.passphrase = ctx.apn.prod_pass_phrase;
-            }
-        }
-        else {
-            options = {
-                "key": ctx.apn.dev_key,
-                "cert": ctx.apn.dev_cert,
-                "interval": 43200,
-                "batchFeedback": true,
-                "production": false
-            };
-            if(ctx.apn.stg_pass_phrase) {
-                options.passphrase = ctx.apn.stg_pass_phrase;
-            }
-        }
+        var options = {
+            "key": ctx.apn.key,
+            "cert": ctx.apn.cert,
+            "interval": 43200,
+            "batchFeedback": true,
+            "production": ctx.apn.sandbox,
+            "passphrase": ctx.apn.pass_phrase
+        };
         ctx.apn_connection = new Apn.Connection(options);
         ctx.apn_connection.on("transmissionError", function(errorCode, notification, recipient) {
             onTransmissionError(ctx, errorCode, notification, recipient);
@@ -360,14 +343,12 @@ function push(ctx, tokens, payload) {
  * @returns {*}
  * @version 0.1
  */
-function Ios(dev_key_path, dev_cert_path, prod_key_path, prod_cert_path, prod_pass_phrase, stg_pass_phrase) {
+function Ios(key, cert, pass_phrase, sandbox) {
     this.apn = {
-        prod_key: prod_key_path,
-        prod_cert: prod_cert_path,
-        dev_key: dev_key_path,
-        dev_cert: dev_cert_path,
-        prod_pass_phrase: prod_pass_phrase,
-        stg_pass_phrase: stg_pass_phrase
+        key: key,
+        cert: cert,
+        pass_phrase: pass_phrase,
+        sandbox: sandbox
     };
 }
 

tests/index.js

@@ -13,9 +13,7 @@ describe("Notification", function() {
         global.RootPath = path.resolve("");
         var key = global.RootPath + "/tests/assets/key.pem";
         var cert = global.RootPath + "/tests/assets/cert.pem";
-        var prodPassPhrase = "";
-        var stgPassPhrase = "";
-        notification.setupIOSClient(key,cert,key,cert,prodPassPhrase,stgPassPhrase);
+        notification.setupIOSClient(key, cert, "", false);
         var apiKey = "please you api key here";
         notification.setupAndroidClient(apiKey);