Skip to content

Commit 7280609

Browse files
authored
Added checks for new 7.1 functions (#42632)
1 parent 6226955 commit 7280609

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ public function resolveAuthenticatedUser($request)
4646
return;
4747
}
4848

49+
if (method_exists($this->pusher, 'authenticateUser')) {
50+
return $this->pusher->authenticateUser($request->socket_id, $user);
51+
}
52+
4953
$settings = $this->pusher->getSettings();
5054
$encodedUser = json_encode($user);
5155
$decodedString = "{$request->socket_id}::user::{$encodedUser}";
@@ -94,7 +98,10 @@ public function validAuthenticationResponse($request, $result)
9498
{
9599
if (str_starts_with($request->channel_name, 'private')) {
96100
return $this->decodePusherResponse(
97-
$request, $this->pusher->socket_auth($request->channel_name, $request->socket_id)
101+
$request,
102+
method_exists($this->pusher, 'authorizeChannel')
103+
? $this->pusher->authorizeChannel($request->channel_name, $request->socket_id)
104+
: $this->pusher->socket_auth($request->channel_name, $request->socket_id)
98105
);
99106
}
100107

@@ -108,10 +115,9 @@ public function validAuthenticationResponse($request, $result)
108115

109116
return $this->decodePusherResponse(
110117
$request,
111-
$this->pusher->presence_auth(
112-
$request->channel_name, $request->socket_id,
113-
$broadcastIdentifier, $result
114-
)
118+
method_exists($this->pusher, 'authorizePresenceChannel')
119+
? $this->pusher->authorizePresenceChannel($request->channel_name, $request->socket_id, $broadcastIdentifier, $result)
120+
: $this->pusher->presence_auth($request->channel_name, $request->socket_id, $broadcastIdentifier, $result)
115121
);
116122
}
117123

0 commit comments

Comments
 (0)