Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove "socket" key from message data #18

Merged
merged 4 commits into from
Nov 25, 2022
Merged

Remove "socket" key from message data #18

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a0bfcb
Pull socket key from payload array so it is not included in the messa…
kwhohasamullet Nov 22, 2022
a0f5d38
Add test for socket key exclusion from message payload
Nov 25, 2022
df5ad00
Use single quotes
Nov 25, 2022
4db83a1
Remove double newline
Nov 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/AblyBroadcaster.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
use Illuminate\Broadcasting\BroadcastException;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Str;
use Illuminate\Support\Arr;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;

class AblyBroadcaster extends Broadcaster
Expand Down Expand Up @@ -317,10 +318,12 @@ public function formatChannels($channels)
*/
protected function buildAblyMessage($event, $payload = [])
{
return tap(new AblyMessage, function ($message) use ($event, $payload) {
$socket = Arr::pull($payload, 'socket');

return tap(new AblyMessage, function ($message) use ($event, $payload, $socket) {
$message->name = $event;
$message->data = $payload;
$message->connectionKey = data_get($payload, 'socket');
$message->connectionKey = $socket;
});
}

Expand Down
21 changes: 21 additions & 0 deletions tests/AblyBroadcasterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,27 @@ public function testLaravelAblyAgentHeader()
$expectedLaravelHeader = 'ably-php/'.\Ably\Defaults::LIB_VERSION.' '.'php/'.Miscellaneous::getNumeric(phpversion()).' laravel-broadcaster/'. AblyBroadcaster::LIB_VERSION;
$this->assertcontains( 'Ably-Agent: '.$expectedLaravelHeader, $ably->http->lastHeaders, 'Expected Laravel broadcaster header in HTTP request' );
}

public function testPayloadShouldNotIncludeSocketKey()
{
$broadcaster = m::mock(AblyBroadcasterExposed::class, [$this->ably, []])->makePartial();

$payload = [
'foo' => 'bar',
'socket' => null
];

$message = $broadcaster->buildAblyMessage('testEvent', $payload);
self::assertArrayNotHasKey('socket', $message->data);
}
}

class AblyBroadcasterExposed extends AblyBroadcaster
{
public function buildAblyMessage($event, $payload = [])
{
return parent::buildAblyMessage($event, $payload);
}
}


Expand Down