From 5669d59bf4a47078729649647de011d8bf533f4a Mon Sep 17 00:00:00 2001 From: Eldon Ahrold Date: Sat, 3 Sep 2016 17:54:47 -0500 Subject: [PATCH 1/3] json_decodes Pusher message from validAuthentiactoinResponse [ Addresses https://github.com/laravel/echo/issues/34 ] --- .../Broadcasters/PusherBroadcaster.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php index c566e6d18aa1..8f0eea07e082 100644 --- a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php +++ b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php @@ -56,10 +56,13 @@ public function auth($request) public function validAuthenticationResponse($request, $result) { if (Str::startsWith($request->channel_name, 'private')) { - return $this->pusher->socket_auth($request->channel_name, $request->socket_id); + return $this->decodedPusherRepsone( + $this->pusher->socket_auth($request->channel_name, $request->socket_id) + ); } else { - return $this->pusher->presence_auth( - $request->channel_name, $request->socket_id, $request->user()->id, $result + return $this->decodedPusherRepsone( + $this->pusher->presence_auth( + $request->channel_name, $request->socket_id, $request->user()->id, $result) ); } } @@ -88,4 +91,14 @@ public function getPusher() { return $this->pusher; } + + /** + * Decoded PusherResponse. + * @param mixed $response + * @return array + */ + public function decodedPusherRepsone($response) + { + return json_decode($response, true); + } } From 5d062ad0b93350b757f151bc9dbe5fe7239c19cc Mon Sep 17 00:00:00 2001 From: Eldon Ahrold Date: Sun, 4 Sep 2016 07:31:42 -0500 Subject: [PATCH 2/3] Add line below document block summary. --- src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php index 8f0eea07e082..3b065861a154 100644 --- a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php +++ b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php @@ -94,6 +94,7 @@ public function getPusher() /** * Decoded PusherResponse. + * * @param mixed $response * @return array */ From 487e98559a69164f1933dea0a7f537430514ee2c Mon Sep 17 00:00:00 2001 From: Eldon Ahrold Date: Sun, 4 Sep 2016 23:25:54 -0500 Subject: [PATCH 3/3] Corrected spelling of response. --- .../Broadcasting/Broadcasters/PusherBroadcaster.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php index 3b065861a154..c7fc9fbdb048 100644 --- a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php +++ b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php @@ -56,11 +56,11 @@ public function auth($request) public function validAuthenticationResponse($request, $result) { if (Str::startsWith($request->channel_name, 'private')) { - return $this->decodedPusherRepsone( + return $this->decodedPusherResponse( $this->pusher->socket_auth($request->channel_name, $request->socket_id) ); } else { - return $this->decodedPusherRepsone( + return $this->decodedPusherResponse( $this->pusher->presence_auth( $request->channel_name, $request->socket_id, $request->user()->id, $result) ); @@ -98,7 +98,7 @@ public function getPusher() * @param mixed $response * @return array */ - public function decodedPusherRepsone($response) + public function decodedPusherResponse($response) { return json_decode($response, true); }