Show server status in sidebar properly on subuser views

Author: DaneEveritt

app/Http/Controllers/Server/SubuserController.php

@@ -28,6 +28,7 @@
 use Log;
 use Auth;
 use Alert;
+use Javascript;
 use Pterodactyl\Models;
 use Illuminate\Http\Request;
 use Pterodactyl\Exceptions\DisplayException;
@@ -51,10 +52,16 @@ public function getIndex(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('list-subusers', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         return view('server.users.index', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
             'subusers' => Models\Subuser::select('subusers.*', 'users.email', 'users.username')
                 ->join('users', 'users.id', '=', 'subusers.user_id')
                 ->where('server_id', $server->id)
@@ -66,6 +73,12 @@ public function getView(Request $request, $uuid, $id)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('view-subuser', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         $subuser = Models\Subuser::select('subusers.*', 'users.email as a_userEmail')
             ->join('users', 'users.id', '=', 'subusers.user_id')
@@ -87,7 +100,7 @@ public function getView(Request $request, $uuid, $id)
 
         return view('server.users.view', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
             'subuser' => $subuser,
             'permissions' => $permissions,
         ]);
@@ -137,10 +150,16 @@ public function getNew(Request $request, $uuid)
     {
         $server = Models\Server::getByUUID($uuid);
         $this->authorize('create-subuser', $server);
+        $node = Models\Node::find($server->node);
+
+        Javascript::put([
+            'server' => collect($server->makeVisible('daemonSecret'))->only(['uuid', 'uuidShort', 'daemonSecret', 'username']),
+            'node' => collect($node)->only('fqdn', 'scheme', 'daemonListen'),
+        ]);
 
         return view('server.users.new', [
             'server' => $server,
-            'node' => Models\Node::find($server->node),
+            'node' => $node,
         ]);
     }
 

resources/themes/pterodactyl/server/users/index.blade.php

@@ -84,3 +84,8 @@
     </div>
 </div>
 @endsection
+
+@section('footer-scripts')
+    @parent
+    {!! Theme::js('js/frontend/server.socket.js') !!}
+@endsection

resources/themes/pterodactyl/server/users/new.blade.php

@@ -400,6 +400,7 @@
 
 @section('footer-scripts')
     @parent
+    {!! Theme::js('js/frontend/server.socket.js') !!}
     <script type="text/javascript">
         $(document).ready(function () {
             $('#selectAllCheckboxes').on('click', function () {

resources/themes/pterodactyl/server/users/view.blade.php

@@ -404,6 +404,7 @@
 
 @section('footer-scripts')
     @parent
+    {!! Theme::js('js/frontend/server.socket.js') !!}
     <script type="text/javascript">
         $(document).ready(function () {
             $('#selectAllCheckboxes').on('click', function () {