Added missing test to make sure publish payload doesn't have socket key

src/Utils.php

@@ -60,6 +60,9 @@ public static function isJwtValid($jwt, $timeFn, $key)
         return $isSignatureValid && ! $isTokenExpired;
     }
 
+    /**
+     * https://www.php.net/manual/en/function.base64-encode.php#127544
+     */
     public static function base64url_encode($str): string
     {
         return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');

tests/AblyBroadcasterTest.php

@@ -320,16 +320,33 @@ public function testLaravelAblyAgentHeader()
         $this->assertcontains( 'Ably-Agent: '.$expectedLaravelHeader, $ably->http->lastHeaders, 'Expected Laravel broadcaster header in HTTP request '.json_encode($ably->http->lastHeaders));
     }
 
-    public function testPayloadShouldNotIncludeSocketKey()
+    public function testPublishPayloadShouldNotIncludeSocketKey()
     {
+        $ably = (new AblyFactory())->make([
+            'key' => 'abcd:efgh',
+            'httpClass' => 'Ably\LaravelBroadcaster\Tests\HttpMock',
+        ]);
+        $broadcaster = m::mock(AblyBroadcasterExposed::class, [$ably, []])->makePartial();
 
-//        self::assertArrayNotHasKey('socket', $message->data);
+        $socketIdObject = new \stdClass();
+        $socketIdObject->connectionKey = 'foo';
+        $socketIdObject->clientId = 'sacOO7';
+        $payload = [
+            'foo' => 'bar',
+            'socket' => Utils::base64url_encode(json_encode($socketIdObject))
+        ];
 
+        $broadcaster->broadcast(["channel1", "channel2"], 'testEvent', $payload);
+
+        self::assertCount(2, $broadcaster->payloads);
+        foreach ($broadcaster->payloads as $payload) {
+            self::assertArrayNotHasKey('socket', $payload);
+        }
     }
+
     public function testBuildMessageBasedOnSocketIdObject()
     {
         $broadcaster = m::mock(AblyBroadcasterExposed::class, [$this->ably, []])->makePartial();
-
         $payload = [
             'foo' => 'bar',
             'chat' => 'hello there'
@@ -354,8 +371,10 @@ public function testBuildMessageBasedOnSocketIdObject()
 
 class AblyBroadcasterExposed extends AblyBroadcaster
 {
+    public $payloads = [];
     public function buildAblyMessage($event, $payload = [], $socketIdObject = null)
     {
+        $this->payloads[] = $payload;
         return parent::buildAblyMessage($event, $payload, $socketIdObject);
     }
 }