Remove old properties from gateway payload as well as authentication when getting the gateway address

Author: codyphobe

src/Commands/SetupCommand.php

@@ -86,14 +86,10 @@ public function handle()
             'op' => 2,
             'd' => [
                 'token' => $this->token,
-                'v' => 3,
-                'compress' => false,
                 'properties' => [
                     '$os' => PHP_OS,
                     '$browser' => 'laravel-notification-channels-discord',
                     '$device' => 'laravel-notification-channels-discord',
-                    '$referrer' => '',
-                    '$referring_domain' => '',
                 ],
             ],
         ]));
@@ -132,11 +128,7 @@ public function getGateway()
         $gateway = $this->gateway;
 
         try {
-            $response = $this->guzzle->get('https://discordapp.com/api/gateway', [
-                'headers' => [
-                    'Authorization' => 'Bot '.$this->token,
-                ],
-            ]);
+            $response = $this->guzzle->get('https://discordapp.com/api/gateway');
 
             $gateway = Arr::get(json_decode($response->getBody(), true), 'url', $gateway);
         } catch (Exception $e) {

tests/SetupCommandTest.php

@@ -59,11 +59,7 @@ public function it_fetches_the_websocket_gateway_url()
     {
         $http = Mockery::mock(HttpClient::class);
 
-        $http->shouldReceive('get')->with('https://discordapp.com/api/gateway', [
-            'headers' => [
-                'Authorization' => 'Bot my-token',
-            ],
-        ])->once()->andReturn(new Response(200, [], json_encode(['url' => 'wss://test-gateway.discord.gg'])));
+        $http->shouldReceive('get')->with('https://discordapp.com/api/gateway')->once()->andReturn(new Response(200, [], json_encode(['url' => 'wss://test-gateway.discord.gg'])));
 
         $command = new SetupCommand($http, 'my-token');
 
@@ -77,11 +73,7 @@ public function it_returns_a_default_websocket_gateway_url()
     {
         $http = Mockery::mock(HttpClient::class);
 
-        $http->shouldReceive('get')->with('https://discordapp.com/api/gateway', [
-            'headers' => [
-                'Authorization' => 'Bot my-token',
-            ],
-        ])->once()->andThrow(new RequestException('Not found', Mockery::mock(Request::class), new Response(404, [], json_encode(['message' => 'Not found']))));
+        $http->shouldReceive('get')->with('https://discordapp.com/api/gateway')->once()->andThrow(new RequestException('Not found', Mockery::mock(Request::class), new Response(404, [], json_encode(['message' => 'Not found']))));
 
         $command = Mockery::mock(SetupCommand::class.'[warn]', [$http, 'my-token']);
 
@@ -102,14 +94,10 @@ public function it_connects_to_the_discord_gateway()
             'op' => 2,
             'd' => [
                 'token' => 'my-token',
-                'v' => 3,
-                'compress' => false,
                 'properties' => [
                     '$os' => PHP_OS,
                     '$browser' => 'laravel-notification-channels-discord',
                     '$device' => 'laravel-notification-channels-discord',
-                    '$referrer' => '',
-                    '$referring_domain' => '',
                 ],
             ],
         ]))->once();
@@ -137,14 +125,10 @@ public function it_notifies_the_user_of_a_failed_identification_attempt()
             'op' => 2,
             'd' => [
                 'token' => 'my-token',
-                'v' => 3,
-                'compress' => false,
                 'properties' => [
                     '$os' => PHP_OS,
                     '$browser' => 'laravel-notification-channels-discord',
                     '$device' => 'laravel-notification-channels-discord',
-                    '$referrer' => '',
-                    '$referring_domain' => '',
                 ],
             ],
         ]))->once();