Fixed an issue that prevented authentication in private or presence c…

…hannels containing the words 'private' or 'presence' in their channel names
laravel · Nov 10, 2016 · db8dd34 · db8dd34
1 parent 57be173
commit db8dd34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -41,8 +41,14 @@ public function auth($request)
             throw new HttpException(403);
         }
 
+        if (Str::startsWith($request->channel_name, 'private-')) {
+            return parent::verifyUserCanAccessChannel(
+                $request, Str::replaceFirst('private-', '', $request->channel_name)
+            );
+        }
+
         return parent::verifyUserCanAccessChannel(
-            $request, str_replace(['private-', 'presence-'], '', $request->channel_name)
+            $request, Str::replaceFirst('presence-', '', $request->channel_name)
         );
     }
 

diff --git a/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php b/src/Illuminate/Broadcasting/Broadcasters/RedisBroadcaster.php
@@ -49,8 +49,14 @@ public function auth($request)
             throw new HttpException(403);
         }
 
+        if (Str::startsWith($request->channel_name, 'private-')) {
+            return parent::verifyUserCanAccessChannel(
+                $request, Str::replaceFirst('private-', '', $request->channel_name)
+            );
+        }
+
         return parent::verifyUserCanAccessChannel(
-            $request, str_replace(['private-', 'presence-'], '', $request->channel_name)
+            $request, Str::replaceFirst('presence-', '', $request->channel_name)
         );
     }