@@ -13,7 +13,6 @@ |
||
| 13 | 13 | use Shamaseen\Laravel\Ratchet\Exceptions\WebSocketException; |
| 14 | 14 | use Shamaseen\Laravel\Ratchet\Facades\WsRoute; |
| 15 | 15 | use Shamaseen\Laravel\Ratchet\Objects\Clients\Client; |
| 16 | -use Shamaseen\Laravel\Ratchet\Routes\Routes; |
|
| 17 | 16 | use Ratchet\ConnectionInterface; |
| 18 | 17 | use Ratchet\MessageComponentInterface; |
| 19 | 18 | use Shamaseen\Laravel\Ratchet\Traits\WebSocketMessagesManager; |
@@ -76,10 +76,11 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | \Session::start(); |
| 78 | 78 | |
| 79 | - if($this->routes[$msg->route]->auth && !\Auth::check()) |
|
| 80 | - $this->error($msg,$from,'Unauthenticated.'); |
|
| 81 | - else |
|
| 82 | - $this->userAuthSocketMapper[\Auth::id()] = $from->resourceId; |
|
| 79 | + if($this->routes[$msg->route]->auth && !\Auth::check()) { |
|
| 80 | + $this->error($msg,$from,'Unauthenticated.'); |
|
| 81 | + } else { |
|
| 82 | + $this->userAuthSocketMapper[\Auth::id()] = $from->resourceId; |
|
| 83 | + } |
|
| 83 | 84 | |
| 84 | 85 | $class = $this->routes[$msg->route]->controller; |
| 85 | 86 | $method = $this->routes[$msg->route]->method; |
@@ -95,8 +96,7 @@ discard block |
||
| 95 | 96 | } |
| 96 | 97 | |
| 97 | 98 | $controller->$method($msg); |
| 98 | - } |
|
| 99 | - catch (WebSocketException $exception) |
|
| 99 | + } catch (WebSocketException $exception) |
|
| 100 | 100 | { |
| 101 | 101 | |
| 102 | 102 | } |
@@ -136,8 +136,9 @@ discard block |
||
| 136 | 136 | $this->error($msg,$from,'You can\'t send a request without the route and the session id !'); |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - if(!isset($this->routes[$msg->route])) |
|
| 140 | - $this->error($msg,$from,'No such route !'); |
|
| 139 | + if(!isset($this->routes[$msg->route])) { |
|
| 140 | + $this->error($msg,$from,'No such route !'); |
|
| 141 | + } |
|
| 141 | 142 | } |
| 142 | 143 | |
| 143 | 144 | /** |