Fix up subuser API response for clients

app/Transformers/Api/Client/ServerTransformer.php

@@ -4,13 +4,14 @@ namespace Pterodactyl\Transformers\Api\Client;
 
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\Server;
+use Pterodactyl\Models\Subuser;
 
 class ServerTransformer extends BaseClientTransformer
 {
     /**
      * @var array
      */
-    protected $availableIncludes = ['egg'];
+    protected $availableIncludes = ['egg', 'subusers'];
 
     /**
      * @return string
@@ -69,4 +70,16 @@ class ServerTransformer extends BaseClientTransformer
     {
         return $this->item($server->egg, $this->makeTransformer(EggTransformer::class), Egg::RESOURCE_NAME);
     }
+
+    /**
+     * Returns the subusers associated with this server.
+     *
+     * @param \Pterodactyl\Models\Server $server
+     * @return \League\Fractal\Resource\Collection
+     * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException
+     */
+    public function includeSubusers(Server $server)
+    {
+        return $this->collection($server->subusers, $this->makeTransformer(SubuserTransformer::class), Subuser::RESOURCE_NAME);
+    }
 }

app/Transformers/Api/Client/SubuserTransformer.php

@@ -2,12 +2,15 @@
 
 namespace Pterodactyl\Transformers\Api\Client;
 
-use Illuminate\Support\Str;
+use Pterodactyl\Models\User;
 use Pterodactyl\Models\Subuser;
 
 class SubuserTransformer extends BaseClientTransformer
 {
-    protected $availableIncludes = ['permissions'];
+    /**
+     * @var array
+     */
+    protected $defaultIncludes = ['user'];
 
     /**
      * Return the resource name for the JSONAPI output.
@@ -20,23 +23,15 @@ class SubuserTransformer extends BaseClientTransformer
     }
 
     /**
-     * Transforms a User model into a representation that can be shown to regular
-     * users of the API.
+     * Transforms a subuser into a model that can be shown to a front-end user.
      *
      * @param \Pterodactyl\Models\Subuser $model
-     * @return array
+     * @return array|void
      */
     public function transform(Subuser $model)
     {
-        $user = $model->user;
-
         return [
-            'uuid' => $user->uuid,
-            'username' => $user->username,
-            'email' => $user->email,
-            'image' => 'https://gravatar.com/avatar/' . md5(Str::lower($user->email)),
-            '2fa_enabled' => $user->use_totp,
-            'created_at' => $model->created_at->toIso8601String(),
+            'permissions' => $model->permissions->pluck('permission'),
         ];
     }
 
@@ -45,11 +40,10 @@ class SubuserTransformer extends BaseClientTransformer
      *
      * @param \Pterodactyl\Models\Subuser $model
      * @return \League\Fractal\Resource\Item
+     * @throws \Pterodactyl\Exceptions\Transformer\InvalidTransformerLevelException
      */
-    public function includePermissions(Subuser $model)
+    public function includeUser(Subuser $model)
     {
-        return $this->item($model, function (Subuser $model) {
-            return ['permissions' => $model->permissions->pluck('permission')];
-        });
+        return $this->item($model->user, $this->makeTransformer(UserTransformer::class), User::RESOURCE_NAME);
     }
 }

app/Transformers/Api/Client/UserTransformer.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Pterodactyl\Transformers\Api\Client;
+
+use Illuminate\Support\Str;
+use Pterodactyl\Models\User;
+
+class UserTransformer extends BaseClientTransformer
+{
+    /**
+     * Return the resource name for the JSONAPI output.
+     *
+     * @return string
+     */
+    public function getResourceName(): string
+    {
+        return User::RESOURCE_NAME;
+    }
+
+    /**
+     * Transforms a User model into a representation that can be shown to regular
+     * users of the API.
+     *
+     * @param \Pterodactyl\Models\User $model
+     * @return array
+     */
+    public function transform(User $model)
+    {
+        return [
+            'uuid' => $model->uuid,
+            'username' => $model->username,
+            'email' => $model->email,
+            'image' => 'https://gravatar.com/avatar/' . md5(Str::lower($model->email)),
+            '2fa_enabled' => $model->use_totp,
+            'created_at' => $model->created_at->toIso8601String(),
+        ];
+    }
+}