Merge pull request yongjhih#76 from Hellslicer/passphrase

Add missing passphrase config for APNS' PFX

Author: yongjhih

ADVANCE.md

@@ -187,10 +187,12 @@ parse-server:
     GCM_ID: $GCM_ID
     GCM_KEY: $GCM_KEY
     PRODUCTION_PFX: $PRODUCTION_PFX
+    PRODUCTION_PASSPHRASE: $PRODUCTION_PASSPHRASE
     PRODUCTION_BUNDLE_ID: $PRODUCTION_BUNDLE_ID
     PRODUCTION_CERT: $PRODUCTION_CERT # prodCert.pem
     PRODUCTION_KEY: $PRODUCTION_KEY # prodKey.pem
     DEV_PFX: $DEV_PFX
+    DEV_PASSPHRASE: $DEV_PASSPHRASE
     DEV_BUNDLE_ID: $DEV_BUNDLE_ID
     DEV_CERT: $DEV_CERT # devCert.pem
     DEV_KEY: $DEV_KEY # devKey.pem

docker-compose-le.yml

@@ -21,10 +21,12 @@ parse-server:
     GCM_ID: $GCM_ID
     GCM_KEY: $GCM_KEY
     PRODUCTION_PFX: $PRODUCTION_PFX
+    PRODUCTION_PASSPHRASE: $PRODUCTION_PASSPHRASE
     PRODUCTION_BUNDLE_ID: $PRODUCTION_BUNDLE_ID
     PRODUCTION_CERT: $PRODUCTION_CERT # prodCert.pem
     PRODUCTION_KEY: $PRODUCTION_KEY # prodKey.pem
     DEV_PFX: $DEV_PFX
+    DEV_PASSPHRASE: $DEV_PASSPHRASE
     DEV_BUNDLE_ID: $DEV_BUNDLE_ID
     DEV_CERT: $DEV_CERT # devCert.pem
     DEV_KEY: $DEV_KEY # devKey.pem

docker-compose-production.yml

@@ -21,10 +21,12 @@ parse-server:
     GCM_ID: $GCM_ID
     GCM_KEY: $GCM_KEY
     PRODUCTION_PFX: $PRODUCTION_PFX
+    PRODUCTION_PASSPHRASE: $PRODUCTION_PASSPHRASE
     PRODUCTION_BUNDLE_ID: $PRODUCTION_BUNDLE_ID
     PRODUCTION_CERT: $PRODUCTION_CERT # prodCert.pem
     PRODUCTION_KEY: $PRODUCTION_KEY # prodKey.pem
     DEV_PFX: $DEV_PFX
+    DEV_PASSPHRASE: $DEV_PASSPHRASE
     DEV_BUNDLE_ID: $DEV_BUNDLE_ID
     DEV_CERT: $DEV_CERT # devCert.pem
     DEV_KEY: $DEV_KEY # devKey.pem

docker-compose-without-dashboard.yml

@@ -20,10 +20,12 @@ parse-server:
     GCM_ID: $GCM_ID
     GCM_KEY: $GCM_KEY
     PRODUCTION_PFX: $PRODUCTION_PFX
+    PRODUCTION_PASSPHRASE: $PRODUCTION_PASSPHRASE
     PRODUCTION_BUNDLE_ID: $PRODUCTION_BUNDLE_ID
     PRODUCTION_CERT: $PRODUCTION_CERT # prodCert.pem
     PRODUCTION_KEY: $PRODUCTION_KEY # prodKey.pem
     DEV_PFX: $DEV_PFX
+    DEV_PASSPHRASE: $DEV_PASSPHRASE
     DEV_BUNDLE_ID: $DEV_BUNDLE_ID
     DEV_CERT: $DEV_CERT # devCert.pem
     DEV_KEY: $DEV_KEY # devKey.pem

docker-compose.yml

@@ -21,10 +21,12 @@ parse-server:
     GCM_ID: $GCM_ID
     GCM_KEY: $GCM_KEY
     PRODUCTION_PFX: $PRODUCTION_PFX
+    PRODUCTION_PASSPHRASE: $PRODUCTION_PASSPHRASE
     PRODUCTION_BUNDLE_ID: $PRODUCTION_BUNDLE_ID
     PRODUCTION_CERT: $PRODUCTION_CERT # prodCert.pem
     PRODUCTION_KEY: $PRODUCTION_KEY # prodKey.pem
     DEV_PFX: $DEV_PFX
+    DEV_PASSPHRASE: $DEV_PASSPHRASE
     DEV_BUNDLE_ID: $DEV_BUNDLE_ID
     DEV_CERT: $DEV_CERT # devCert.pem
     DEV_KEY: $DEV_KEY # devKey.pem

index.js

@@ -46,12 +46,14 @@ var productionCert = process.env.PRODUCTION_CERT || '/certs/production-pfx-cert.
 productionCert = isFile(productionCert) ? productionCert : null;
 var productionKey = process.env.PRODUCTION_KEY || '/certs/production-pfx-key.pem';
 productionKey = isFile(productionKey) ? productionKey : null;
+var productionPassphrase = process.env.PRODUCTION_PASSPHRASE || null;
 var productionPushConfig;
 if (productionBundleId && (productionPfx || (productionCert && productionKey))) {
     productionPushConfig = {
         pfx: productionPfx,
         cert: productionCert,
         key: productionKey,
+        passphrase: productionPassphrase,
         bundleId: productionBundleId,
         production: true
     };
@@ -65,12 +67,14 @@ var devCert = process.env.DEV_CERT || '/certs/dev-pfx-cert.pem';
 devCert = isFile(devCert) ? devCert : null;
 var devKey = process.env.DEV_KEY || '/certs/dev-pfx-key.pem';
 devKey = isFile(devKey) ? devKey : null;
+var devPassphrase = process.env.DEV_PASSPHRASE || null;
 var devPushConfig;
 if (devBundleId && (devPfx || (devCert && devKey))) { // exsiting files if not null
     devPushConfig = {
         pfx: devPfx,
         cert: devCert,
         key: devKey,
+        passphrase: devPassphrase,
         bundleId: devBundleId,
         production: false
     };