Merge pull request #66 from ker0x/feature/issue-61

[feature #61] Add channel standby for Entry callback
ker0x · Aug 28, 2017 · fc8bc77 · fc8bc77
2 parents 3648297 + cdd4fda
commit fc8bc77
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 2 deletions.
diff --git a/src/Model/Callback/Entry.php b/src/Model/Callback/Entry.php
@@ -6,6 +6,11 @@
 
 class Entry
 {
+    const CHANNELS = [
+        'messaging',
+        'standby'
+    ];
+
     /**
      * @var string
      */
@@ -67,8 +72,13 @@ public function getEvents(): array
     public static function create(array $entry): Entry
     {
         $events = [];
-        foreach ($entry['messaging'] as $event) {
-            $events[] = EventFactory::create($event);
+
+        foreach (self::CHANNELS as $channel) {
+            if (isset($entry[$channel])) {
+                foreach ($entry[$channel] as $event) {
+                    $events[] = EventFactory::create($event);
+                }
+            }
         }
 
         return new static($entry['id'], $entry['time'], $events);

diff --git a/tests/Mocks/Callback/stand_by.json b/tests/Mocks/Callback/stand_by.json
@@ -0,0 +1,28 @@
+{
+  "object": "page",
+  "entry": [
+    {
+      "id": "PAGE_ID",
+      "time": 1458692752478,
+      "standby": [
+        {
+          "sender": {
+            "id": "USER_ID"
+          },
+          "recipient": {
+            "id": "PAGE_ID"
+          },
+          "timestamp": 1458692752478,
+          "message": {
+            "mid": "mid.1457764197618:41d102a3e1ae206a38",
+            "seq": 73,
+            "text": "hello, world!",
+            "quick_reply": {
+              "payload": "DEVELOPER_DEFINED_PAYLOAD"
+            }
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/TestCase/Api/WebhookTest.php b/tests/TestCase/Api/WebhookTest.php
@@ -155,6 +155,39 @@ public function testGetCallbackEvents()
         $this->assertEquals([$event], $events);
     }
 
+    public function testStandbyEntry()
+    {
+        $appSecret = 'app_secret';
+        $verifyToken = 'verify_token';
+        $pageToken = 'page_token';
+
+
+        $requestBody = file_get_contents(__DIR__ . '/../../Mocks/Callback/stand_by.json');
+        $requestHeaders = [
+            'Content-Type' => 'application/json',
+            'X-Hub-Signature' => 'sha1=' . hash_hmac('sha1', $requestBody, $appSecret)
+        ];
+
+        $request = new ServerRequest('POST', '/app.php/facebook/webhook', $requestHeaders, $requestBody);
+
+        $bodyResponse = file_get_contents(__DIR__ . '/../../Mocks/Response/Webhook/success.json');
+        $mockedResponse = new MockHandler([
+            new Response(200, [], $bodyResponse),
+        ]);
+
+        $handler = HandlerStack::create($mockedResponse);
+        $client = new Client([
+            'handler' => $handler
+        ]);
+
+        $event = new MessageEvent('USER_ID', 'PAGE_ID', 1458692752478, new Message('mid.1457764197618:41d102a3e1ae206a38', 73, 'hello, world!', 'DEVELOPER_DEFINED_PAYLOAD'));
+
+        $webhookApi = new Webhook($appSecret, $verifyToken, $pageToken, $client, $request);
+        $events = $webhookApi->getCallbackEvents();
+
+        $this->assertEquals([$event], $events);
+    }
+
     public function tearDown()
     {
         unset($this->webhookApi);