new configuration option in config.yml : apns_server, apns_topic, gcm_server, all with default values

Author: ReliefAppsDev3

DependencyInjection/Configuration.php

@@ -30,12 +30,15 @@ public function getConfigTreeBuilder()
  ->arrayNode('android')
  ->children()
  ->scalarNode('server_key')->end()
+ ->scalarNode('gcm_server')->defaultValue('android.googleapis.com')->end()
  ->end()
  ->end()
  ->arrayNode('ios')
  ->children()
  ->scalarNode('push_certificate')->end()
  ->scalarNode('push_passphrase')->end()
+ ->scalarNode('apns_server')->defaultValue('api.push.apple.com')->end()
+ ->scalarNode('apns_topic')->defaultValue('reliefapps_notification')->end()
  ->enumNode('protocol')->values(array('legacy', 'http2'))->defaultValue('http2')->end()
  ->end()
  ->end()

DependencyInjection/ReliefappsNotificationExtension.php

@@ -26,9 +26,12 @@ public function load(array $configs, ContainerBuilder $container)
  $loader->load('services.yml');
 
  $container->setParameter('reliefapps_notification.android.server_key', $config['android']['server_key']);
+ $container->setParameter('reliefapps_notification.android.gcm_server', $config['android']['gcm_server']);
  $container->setParameter('reliefapps_notification.ios.push_certificate', $config['ios']['push_certificate']);
  $container->setParameter('reliefapps_notification.ios.push_passphrase', $config['ios']['push_passphrase']);
  $container->setParameter('reliefapps_notification.ios.protocol', $config['ios']['protocol']);
+ $container->setParameter('reliefapps_notification.ios.apns_server', $config['ios']['apns_server']);
+ $container->setParameter('reliefapps_notification.ios.apns_topic', $config['ios']['apns_topic']);
  $container->setParameter('reliefapps_notification.device.class', $config['device']['class']);
  $container->setParameter('reliefapps_notification.model_manager_name', $config['model_manager_name']);
  }

Resources/Model/NotificationBody.php

@@ -246,6 +246,18 @@ public function getActions()
  return $this->actions;
  }
 
+ /**
+ * Add an action
+ *
+ * @return Array
+ */
+ public function addAction($action)
+ {
+ $this->actions[] = $action;
+
+ return $this;
+ }
+
  /**
  * Set the value of Actions
  *

Resources/config/services.yml

@@ -1,7 +1,15 @@
 services:
  reliefapps_notification.push_manager:
  class: Reliefapps\NotificationBundle\Utils\PushManager
- arguments: ["%reliefapps_notification.ios.push_certificate%", "%reliefapps_notification.ios.push_passphrase%", "%reliefapps_notification.ios.protocol%", "%reliefapps_notification.android.server_key%", "@service_container"]
+ arguments:
+ - "%reliefapps_notification.ios.push_certificate%"
+ - "%reliefapps_notification.ios.push_passphrase%"
+ - "%reliefapps_notification.ios.protocol%"
+ - "%reliefapps_notification.ios.apns_server%"
+ - "%reliefapps_notification.ios.apns_topic%"
+ - "%reliefapps_notification.android.server_key%"
+ - "%reliefapps_notification.android.gcm_server%"
+ - "@service_container"
 
  reliefapps_notification.device.manager.doctrine:
  class: Reliefapps\NotificationBundle\Doctrine\DeviceManager

Utils/PushManager.php

@@ -15,12 +15,15 @@ class PushManager
 
 
 
- public function __construct($ios_push_certificate, $ios_push_passphrase, $ios_protocol, $android_server_key, $container)
+ public function __construct($ios_push_certificate, $ios_push_passphrase, $ios_protocol,  $apns_server, $apns_topic, $android_server_key, $gcm_server,  $container)
  {
  $this->iosCertificate = $ios_push_certificate;
  $this->iosPassphrase = $ios_push_passphrase;
  $this->iosProtocol = $ios_protocol;
+ $this->apns_server = $apns_server;
+ $this->apns_topic = $apns_topic;
  $this->android_server_key = $android_server_key;
+ $this->gcm_server = $gcm_server;
  $this->container = $container;
  $this->device_manager = $container->get('reliefapps_notification.device.manager.doctrine');
  }
@@ -74,7 +77,7 @@ public function sendPushAndroid($devices, $body)
 
  $logger = $this->container->get('logger');
  // ANDROID
- $url = 'https://android.googleapis.com/gcm/send';
+ $url = "https://$this->gcm_server/gcm/send";
  $apiKey = $this->android_server_key;
 
  $getToken = function($obj){ return $obj->getToken(); };
@@ -138,7 +141,7 @@ public function sendPushIOSHttp2($devices, $body)
  return false;
  }
  //$headers = array("authorization: ", "apns-id: ", "apns-expiration: ", "apns-priority: ", "apns-topic: ", "apns-collapse-id: ")
- $headers = array("apns-topic: org.reliefapps.emalsys");
+ $headers = array("apns-topic: $this->apns_topic");
 
  $fields_json = $body->getPayload(NotificationBody::PAYLOAD_JSON_IOS);
  $logger->debug("iOS Payload : " . $fields_json);
@@ -157,7 +160,7 @@ public function sendPushIOSHttp2($devices, $body)
 
  foreach($devices as $device){
  $token = $device->getToken();
- $url = "https://api.push.apple.com/3/device/$token";
+ $url = "https://$this->apns_server/3/device/$token";
  curl_setopt( $ch, CURLOPT_URL, $url );
 
  $response = curl_exec($ch);