diff --git a/src/LaravelEcho/Pusher/Exceptions/UnknownAppId.php b/src/LaravelEcho/Pusher/Exceptions/UnknownAppId.php deleted file mode 100644 index 71a20d0..0000000 --- a/src/LaravelEcho/Pusher/Exceptions/UnknownAppId.php +++ /dev/null @@ -1,12 +0,0 @@ -message = "Could not find app key {$appId}"; - $this->code = 4001; - } -} \ No newline at end of file diff --git a/src/LaravelEcho/Pusher/Exceptions/UnknownAppKey.php b/src/LaravelEcho/Pusher/Exceptions/UnknownAppKey.php new file mode 100644 index 0000000..fc1de78 --- /dev/null +++ b/src/LaravelEcho/Pusher/Exceptions/UnknownAppKey.php @@ -0,0 +1,12 @@ +message = "Could not find app key {$appKey}"; + $this->code = 4001; + } +} \ No newline at end of file diff --git a/src/LaravelEcho/WebSocket/PusherServer.php b/src/LaravelEcho/WebSocket/PusherServer.php index b5fe28e..8d6adce 100644 --- a/src/LaravelEcho/WebSocket/PusherServer.php +++ b/src/LaravelEcho/WebSocket/PusherServer.php @@ -3,7 +3,7 @@ namespace BeyondCode\LaravelWebSockets\LaravelEcho\WebSocket; use BeyondCode\LaravelWebsockets\LaravelEcho\Pusher\Exceptions\PusherException; -use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppId; +use BeyondCode\LaravelWebSockets\LaravelEcho\Pusher\Exceptions\UnknownAppKey; use Exception; use Ratchet\ConnectionInterface; use Ratchet\RFC6455\Messaging\MessageInterface; @@ -48,6 +48,7 @@ class PusherServer extends WebSocketController $exception->getPayload() )); } + dump($exception); } protected function verifyConnection(ConnectionInterface $connection) @@ -58,12 +59,12 @@ class PusherServer extends WebSocketController $queryParameters = []; parse_str($request->getUri()->getQuery(), $queryParameters); - $connection->appId = $queryParameters['appId']; - // Todo: Lookup app-id for multi-tenancy support - if ($connection->appId !== config('broadcasting.connections.pusher.app_id')) { - throw new UnknownAppId($connection->appId); + if ($queryParameters['appKey'] !== config('broadcasting.connections.pusher.key')) { + throw new UnknownAppKey($queryParameters['appKey']); } + + $connection->appId = config('broadcasting.connections.pusher.app_id'); } protected function establishConnection(ConnectionInterface $connection) diff --git a/src/Router.php b/src/Router.php index 5a7c046..2e0342a 100644 --- a/src/Router.php +++ b/src/Router.php @@ -66,7 +66,7 @@ class Router public function echo() { //TODO: add origin checker middleware - $this->get('/app/{appId}', LaravelEcho\WebSocket\PusherServer::class); + $this->get('/app/{appKey}', LaravelEcho\WebSocket\PusherServer::class); // TODO: fleshen out http API $this->get('/apps/{appId}/status', LaravelEcho\Http\Controllers\StatusController::class);