Merge branch 'master' of github.com:beyondcode/laravel-websockets

composer.json

@@ -60,7 +60,7 @@
     "extra": {
         "laravel": {
             "providers": [
-                "BeyondCode\\LaravelWebSockets\\LaravelWebSocketsServiceProvider"
+                "BeyondCode\\LaravelWebSockets\\WebSocketsServiceProvider"
             ],
             "aliases": {
                 "WebSocketRouter": "BeyondCode\\LaravelWebSockets\\Facades\\WebSocketRouter"

src/WebSocketController.php

@@ -11,7 +11,6 @@ class WebSocketController implements MessageComponentInterface
 {
     function onOpen(ConnectionInterface $connection)
     {
-        dump("Client connected");
     }
 
     public function onMessage(ConnectionInterface $connection, MessageInterface $message)

src/WebSocketsServiceProvider.php

@@ -8,7 +8,7 @@ use BeyondCode\LaravelWebSockets\ClientProviders\ClientProvider;
 use Illuminate\Support\ServiceProvider;
 use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Channels\ChannelManager;
 
-class LaravelWebSocketsServiceProvider extends ServiceProvider
+class WebSocketsServiceProvider extends ServiceProvider
 {
     public function boot()
     {

tests/ConnectionTest.php

@@ -3,10 +3,10 @@
 namespace BeyondCode\LaravelWebSockets\Tests;
 
 use BeyondCode\LaravelWebSockets\ClientProviders\Client;
+use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\InvalidSignatureException;
 use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKeyException;
 use BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket\PusherServer;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Message;
-use Ratchet\RFC6455\Messaging\MessageInterface;
 
 class ConnectionTest extends TestCase
 {
@@ -91,4 +91,112 @@ class ConnectionTest extends TestCase
             'channel' => 'basic-channel'
         ]);
     }
+
+    /** @test */
+    public function clients_need_valid_auth_signatures_for_private_channels()
+    {
+        $this->expectException(InvalidSignatureException::class);
+
+        /** @var PusherServer $server */
+        $server = app(PusherServer::class);
+
+        $connection = $this->getWebSocketConnection();
+
+        $message = new Message(json_encode([
+            'event' => 'pusher:subscribe',
+            'data' => [
+                'auth' => 'invalid',
+                'channel' => 'private-channel'
+            ],
+        ]));
+
+        $server->onOpen($connection);
+
+        $server->onMessage($connection, $message);
+    }
+
+    /** @test */
+    public function clients_can_subscribe_to_private_channels()
+    {
+        /** @var PusherServer $server */
+        $server = app(PusherServer::class);
+
+        $connection = $this->getWebSocketConnection();
+
+        $server->onOpen($connection);
+
+        $signature = "{$connection->socketId}:private-channel";
+
+        $message = new Message(json_encode([
+            'event' => 'pusher:subscribe',
+            'data' => [
+                'auth' => $connection->client->appKey.':'.hash_hmac('sha256', $signature, $connection->client->appSecret),
+                'channel' => 'private-channel'
+            ],
+        ]));
+
+        $server->onMessage($connection, $message);
+
+        $connection->assertSentEvent('pusher_internal:subscription_succeeded', [
+            'channel' => 'private-channel'
+        ]);
+    }
+
+    /** @test */
+    public function clients_need_valid_auth_signatures_for_presence_channels()
+    {
+        $this->expectException(InvalidSignatureException::class);
+
+        /** @var PusherServer $server */
+        $server = app(PusherServer::class);
+
+        $connection = $this->getWebSocketConnection();
+
+        $message = new Message(json_encode([
+            'event' => 'pusher:subscribe',
+            'data' => [
+                'auth' => 'invalid',
+                'channel' => 'presence-channel'
+            ],
+        ]));
+
+        $server->onOpen($connection);
+
+        $server->onMessage($connection, $message);
+    }
+
+    /** @test */
+    public function clients_can_subscribe_to_presence_channels()
+    {
+        /** @var PusherServer $server */
+        $server = app(PusherServer::class);
+
+        $connection = $this->getWebSocketConnection();
+
+        $server->onOpen($connection);
+
+        $channelData = [
+            'user_id' => 1,
+            'user_info' => [
+                'name' => 'Marcel'
+            ]
+        ];
+
+        $signature = "{$connection->socketId}:presence-channel:".json_encode($channelData);
+
+        $message = new Message(json_encode([
+            'event' => 'pusher:subscribe',
+            'data' => [
+                'auth' => $connection->client->appKey.':'.hash_hmac('sha256', $signature, $connection->client->appSecret),
+                'channel' => 'presence-channel',
+                'channel_data' => json_encode($channelData)
+            ],
+        ]));
+
+        $server->onMessage($connection, $message);
+
+        $connection->assertSentEvent('pusher_internal:subscription_succeeded', [
+            'channel' => 'presence-channel',
+        ]);
+    }
 }

tests/TestCase.php

@@ -4,13 +4,13 @@ namespace BeyondCode\LaravelWebSockets\Tests;
 
 use GuzzleHttp\Psr7\Request;
 use BeyondCode\LaravelWebSockets\Tests\Mocks\Connection;
-use BeyondCode\LaravelWebSockets\LaravelWebSocketsServiceProvider;
+use BeyondCode\LaravelWebSockets\WebSocketsServiceProvider;
 
 abstract class TestCase extends \Orchestra\Testbench\TestCase
 {
     protected function getPackageProviders($app)
     {
-        return [LaravelWebSocketsServiceProvider::class];
+        return [WebSocketsServiceProvider::class];
     }
 
     protected function getEnvironmentSetUp($app)