Added checks for new 7.1 functions (#42632)

laravel · Jun 3, 2022 · 7280609 · 7280609
1 parent 6226955
commit 7280609
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -46,6 +46,10 @@ public function resolveAuthenticatedUser($request)
             return;
         }
 
+        if (method_exists($this->pusher, 'authenticateUser')) {
+            return $this->pusher->authenticateUser($request->socket_id, $user);
+        }
+
         $settings = $this->pusher->getSettings();
         $encodedUser = json_encode($user);
         $decodedString = "{$request->socket_id}::user::{$encodedUser}";
@@ -94,7 +98,10 @@ public function validAuthenticationResponse($request, $result)
     {
         if (str_starts_with($request->channel_name, 'private')) {
             return $this->decodePusherResponse(
-                $request, $this->pusher->socket_auth($request->channel_name, $request->socket_id)
+                $request,
+                method_exists($this->pusher, 'authorizeChannel')
+                    ? $this->pusher->authorizeChannel($request->channel_name, $request->socket_id)
+                    : $this->pusher->socket_auth($request->channel_name, $request->socket_id)
             );
         }
 
@@ -108,10 +115,9 @@ public function validAuthenticationResponse($request, $result)
 
         return $this->decodePusherResponse(
             $request,
-            $this->pusher->presence_auth(
-                $request->channel_name, $request->socket_id,
-                $broadcastIdentifier, $result
-            )
+            method_exists($this->pusher, 'authorizePresenceChannel')
+                ? $this->pusher->authorizePresenceChannel($request->channel_name, $request->socket_id, $broadcastIdentifier, $result)
+                : $this->pusher->presence_auth($request->channel_name, $request->socket_id, $broadcastIdentifier, $result)
         );
     }