Merge pull request #2 from CoreProc/develop

Access token is now optional and added ability to include custom parameters

Author: chrisbjr

src/GlobeLabsSmsChannel.php

@@ -35,9 +35,10 @@ public function send($notifiable, Notification $notification)
 
         $contactInfo = $notifiable->routeNotificationFor('globeLabsSms');
 
-        // The contact info should include an access_token and a address
-        if (empty($contactInfo['access_token']) || empty($contactInfo['address'])) {
-            throw new CouldNotSendNotification('Missing variables from your routeNotificationForGlobeLabs().');
+        // The contact info should include an address (mobile number). We are making access_token optional. The API
+        // response will catch that anyway.
+        if (empty($contactInfo['address'])) {
+            throw new CouldNotSendNotification('Missing address variable from your routeNotificationForGlobeLabs().');
         }
 
         $message = $notification->toGlobeLabsSms($notifiable);

src/GlobeLabsSmsMessage.php

@@ -16,7 +16,9 @@ class GlobeLabsSmsMessage
 
     protected $address;
 
-    protected $globeLabsSmsApiSendUrl = 'https://devapi.globelabs.com.ph/smsmessaging/v1/outbound/{senderAddress}/requests?access_token={accessToken}';
+    protected $globeLabsSmsApiSendUrl = 'https://devapi.globelabs.com.ph/smsmessaging/v1/outbound/{senderAddress}/requests';
+
+    protected $requestParams;
 
     public static function create($notifiable)
     {
@@ -37,7 +39,20 @@ public function getApiSendUrl()
         $url = config('broadcasting.connections.globe_labs_sms.api_send_url', $this->globeLabsSmsApiSendUrl);
 
         $url = str_replace('{senderAddress}', $this->getSenderAddress(), $url);
-        $url = str_replace('{accessToken}', $this->getAccessToken(), $url);
+
+        $urlParams = [];
+
+        if (! empty($this->getAccessToken())) {
+            $urlParams['access_token'] = $this->getAccessToken();
+        }
+
+        $httpQuery = http_build_query($urlParams);
+
+        if (! empty($httpQuery)) {
+            $httpQuery = '?'.$httpQuery;
+        }
+
+        $url = $url.$httpQuery;
 
         return $url;
     }
@@ -101,6 +116,24 @@ public function setMessage($message)
         return $this;
     }
 
+    /**
+     * An additional method to accommodate any additional parameters needed by the API.
+     *
+     * @param $requestParams
+     * @return GlobeLabsSmsMessage
+     */
+    public function setRequestParams($requestParams)
+    {
+        $this->requestParams = $requestParams;
+
+        return $this;
+    }
+
+    public function getRequestParams()
+    {
+        return $this->requestParams;
+    }
+
     public function toJson()
     {
         $request['outboundSMSMessageRequest']['address'] = $this->getAddress();
@@ -112,6 +145,10 @@ public function toJson()
 
         $request['outboundSMSMessageRequest']['outboundSMSTextMessage']['message'] = $this->getMessage();
 
+        if (! empty($this->getRequestParams())) {
+            $request = array_merge($request, $this->getRequestParams());
+        }
+
         return json_encode($request);
     }
 }