|
3 | 3 | namespace Pterodactyl\Http\Controllers\Api\Client\Servers; |
4 | 4 |
|
5 | 5 | use Carbon\CarbonImmutable; |
6 | | -use Illuminate\Http\Response; |
7 | 6 | use Pterodactyl\Models\Server; |
8 | 7 | use Illuminate\Http\JsonResponse; |
9 | 8 | use Pterodactyl\Models\Permission; |
10 | 9 | use Pterodactyl\Services\Nodes\NodeJWTService; |
11 | | -use Symfony\Component\HttpKernel\Exception\HttpException; |
| 10 | +use Pterodactyl\Exceptions\Http\HttpForbiddenException; |
12 | 11 | use Pterodactyl\Http\Requests\Api\Client\ClientApiRequest; |
13 | 12 | use Pterodactyl\Services\Servers\GetUserPermissionsService; |
14 | 13 | use Pterodactyl\Http\Controllers\Api\Client\ClientApiController; |
@@ -55,26 +54,22 @@ public function __invoke(ClientApiRequest $request, Server $server) |
55 | 54 | { |
56 | 55 | $user = $request->user(); |
57 | 56 | if ($user->cannot(Permission::ACTION_WEBSOCKET_CONNECT, $server)) { |
58 | | - throw new HttpException(Response::HTTP_FORBIDDEN, 'You do not have permission to connect to this server\'s websocket.'); |
| 57 | + throw new HttpForbiddenException('You do not have permission to connect to this server\'s websocket.'); |
59 | 58 | } |
60 | 59 |
|
61 | 60 | $permissions = $this->permissionsService->handle($server, $user); |
62 | 61 |
|
63 | | - $node = null; |
| 62 | + $node = $server->node; |
64 | 63 | if (! is_null($server->transfer)) { |
65 | 64 | // Check if the user has permissions to receive transfer logs. |
66 | 65 | if (! in_array('admin.websocket.transfer', $permissions)) { |
67 | | - throw new HttpException(Response::HTTP_FORBIDDEN, 'You do not have permission to view transfer logs'); |
| 66 | + throw new HttpForbiddenException('You do not have permission to view server transfer logs.'); |
68 | 67 | } |
69 | 68 |
|
70 | 69 | // Redirect the websocket request to the new node if the server has been archived. |
71 | 70 | if ($server->transfer->archived) { |
72 | 71 | $node = $server->transfer->newNode; |
73 | | - } else { |
74 | | - $node = $server->node; |
75 | 72 | } |
76 | | - } else { |
77 | | - $node = $server->node; |
78 | 73 | } |
79 | 74 |
|
80 | 75 | $token = $this->jwtService |
|
0 commit comments