Merge pull request #58 from demokratie-live/sprint#11/push-notifications

fix push notifications for ios

Author: ManAnRuck

.env.example

@@ -4,4 +4,6 @@ ENGINE_API_KEY=
 APPLE_TEAMID=
 APPLE_APN_KEY_ID=
 APPLE_APN_KEY=
-NOTIFICATION_ANDROID_SERVER_KEY=
+NOTIFICATION_ANDROID_SERVER_KEY=
+STAGE= # alpha | beta | production
+NODE_ENV= # development | production

src/config/constants.js

@@ -7,4 +7,18 @@ export default {
   GRAPHQL_PATH: '/graphql',
   BUNDESTAGIO_SERVER_URL: process.env.BUNDESTAGIO_SERVER_URL || 'http://localhost:3100/graphql',
   NOTIFICATION_ANDROID_SERVER_KEY: process.env.NOTIFICATION_ANDROID_SERVER_KEY || false,
+  APN_TOPIC: (() => {
+    switch (process.env.STAGE) {
+      case 'alpha':
+        return 'de.democracy-deutschland.clientapp.alpha';
+      case 'beta':
+        return 'de.democracy-deutschland.clientapp.beta';
+      case 'production':
+        return 'de.democracy-deutschland.clientapp';
+
+      default:
+        console.error('ERROR: no STAGE defined!');
+        return 'de.democracy-deutschland.clientapp';
+    }
+  })(),
 };

src/services/notifications/apn.js

@@ -10,7 +10,7 @@ if (!apnProvider) {
       keyId: process.env.APPLE_APN_KEY_ID,
       teamId: process.env.APPLE_TEAMID,
     },
-    production: process.env.NODE_ENV === 'production', // TODO: handle APLPHA/BETA/PRODUCTION
+    production: process.env.NODE_ENV === 'production',
   };
 
   if (_.filter(options.token, option => !option).length > 0) {

src/services/notifications/index.js

@@ -3,11 +3,13 @@
 import _ from 'lodash';
 import apn from 'apn';
 import gcm from 'node-gcm';
+import util from 'util';
 
 import apnProvider from './apn';
 import gcmProvider from './gcm';
 import UserModel from '../../models/User';
 import ProcedureModel from '../../models/Procedure';
+import CONFIG from '../../config/constants';
 
 const sendNotifications = ({ tokenObjects, message }) => {
   const androidNotificationTokens = [];
@@ -19,7 +21,7 @@ const sendNotifications = ({ tokenObjects, message }) => {
 
           note.alert = message;
           // note.payload = { messageFrom: 'John Appleseed' };
-          note.topic = 'de.democracy-deutschland.clientapp';
+          note.topic = CONFIG.APN_TOPIC;
 
           apnProvider.send(note, token).then((result) => {
             console.log('apnProvider.send', result);
@@ -120,10 +122,10 @@ export default async ({ message, user }) => {
 
             note.alert = message;
             // note.payload = { messageFrom: 'John Appleseed' };
-            note.topic = 'de.democracy-deutschland.clientapp';
+            note.topic = CONFIG.APN_TOPIC;
 
             apnProvider.send(note, token).then((result) => {
-              console.log('apnProvider.send', result);
+              console.log('apnProvider.send', util.inspect(result, false, null));
             });
           }
           break;