Fix bad API behavior

Author: DaneEveritt

CHANGELOG.md

@@ -3,6 +3,10 @@ This file is a running track of new features and fixes to each version of the pa
 
 This project follows [Semantic Versioning](http://semver.org) guidelines.
 
+## v0.7.0-rc.3 (Derelict Dermodactylus)
+### Fixed
+* `[rc.2]` — Fixes bad API behavior on `/user` routes.
+
 ## v0.7.0-rc.2 (Derelict Dermodactylus)
 ### Fixed
 * `[rc.1]` — Fixes exception thrown when revoking user sessions.

app/Http/Controllers/Api/Application/Users/UserController.php

@@ -10,7 +10,6 @@
 use Pterodactyl\Services\Users\UserDeletionService;
 use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
 use Pterodactyl\Transformers\Api\Application\UserTransformer;
-use Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\StoreUserRequest;
 use Pterodactyl\Http\Requests\Api\Application\Users\DeleteUserRequest;
@@ -82,10 +81,10 @@ public function index(GetUsersRequest $request): array
      * Handle a request to view a single user. Includes any relations that
      * were defined in the request.
      *
-     * @param \Pterodactyl\Http\Requests\Api\Application\Users\GetUserRequest $request
+     * @param \Pterodactyl\Http\Requests\Api\Application\Users\GetUsersRequest $request
      * @return array
      */
-    public function view(GetUserRequest $request): array
+    public function view(GetUsersRequest $request): array
     {
         return $this->fractal->item($request->getModel(User::class))
             ->transformWith($this->getTransformer(UserTransformer::class))

app/Http/Middleware/Api/ApiSubstituteBindings.php

@@ -6,6 +6,7 @@
 use Pterodactyl\Models\Egg;
 use Pterodactyl\Models\Nest;
 use Pterodactyl\Models\Node;
+use Pterodactyl\Models\User;
 use Pterodactyl\Models\Server;
 use Pterodactyl\Models\Database;
 use Pterodactyl\Models\Location;
@@ -28,6 +29,7 @@ class ApiSubstituteBindings extends SubstituteBindings
         'nest' => Nest::class,
         'node' => Node::class,
         'server' => Server::class,
+        'user' => User::class,
     ];
 
     /**

app/Http/Requests/Api/Application/Nodes/UpdateNodeRequest.php

@@ -6,19 +6,6 @@
 
 class UpdateNodeRequest extends StoreNodeRequest
 {
-    /**
-     * Determine if the node being requested for editing exists
-     * on the Panel before validating the data.
-     *
-     * @return bool
-     */
-    public function resourceExists(): bool
-    {
-        $node = $this->route()->parameter('node');
-
-        return $node instanceof Node && $node->exists;
-    }
-
     /**
      * Apply validation rules to this request. Uses the parent class rules()
      * function but passes in the rules for updating rather than creating.
@@ -28,7 +15,7 @@ public function resourceExists(): bool
      */
     public function rules(array $rules = null): array
     {
-        $nodeId = $this->route()->parameter('node')->id;
+        $nodeId = $this->getModel(Node::class)->id;
 
         return parent::rules(Node::getUpdateRulesForId($nodeId));
     }

app/Http/Requests/Api/Application/Users/GetUserRequest.php

@@ -21,20 +21,41 @@ class StoreUserRequest extends ApplicationApiRequest
     /**
      * Return the validation rules for this request.
      *
+     * @param array|null $rules
      * @return array
      */
-    public function rules(): array
+    public function rules(array $rules = null): array
     {
-        return collect(User::getCreateRules())->only([
+        $rules = $rules ?? User::getCreateRules();
+
+        $response = collect($rules)->only([
             'external_id',
             'email',
             'username',
-            'name_first',
-            'name_last',
             'password',
             'language',
             'root_admin',
         ])->toArray();
+
+        $response['first_name'] = $rules['name_first'];
+        $response['last_name'] = $rules['name_last'];
+
+        return $response;
+    }
+
+    /**
+     * @return array
+     */
+    public function validated()
+    {
+        $data = parent::validated();
+
+        $data['name_first'] = $data['first_name'];
+        $data['name_last'] = $data['last_name'];
+
+        unset($data['first_name'], $data['last_name']);
+
+        return $data;
     }
 
     /**

app/Http/Requests/Api/Application/Users/StoreUserRequest.php

@@ -6,36 +6,16 @@
 
 class UpdateUserRequest extends StoreUserRequest
 {
-    /**
-     * Determine if the requested user exists on the Panel.
-     *
-     * @return bool
-     */
-    public function resourceExists(): bool
-    {
-        $user = $this->route()->parameter('user');
-
-        return $user instanceof User && $user->exists;
-    }
-
     /**
      * Return the validation rules for this request.
      *
+     * @param array|null $rules
      * @return array
      */
-    public function rules(): array
+    public function rules(array $rules = null): array
     {
-        $userId = $this->route()->parameter('user')->id;
+        $userId = $this->getModel(User::class)->id;
 
-        return collect(User::getUpdateRulesForId($userId))->only([
-            'external_id',
-            'email',
-            'username',
-            'name_first',
-            'name_last',
-            'password',
-            'language',
-            'root_admin',
-        ])->toArray();
+        return parent::rules(User::getUpdateRulesForId($userId));
     }
 }

app/Http/Requests/Api/Application/Users/UpdateUserRequest.php

@@ -25,14 +25,27 @@ public function getResourceName(): string
     }
 
     /**
-     * Return a generic transformed subuser array.
+     * Return a transformed User model that can be consumed by external services.
      *
      * @param \Pterodactyl\Models\User $user
      * @return array
      */
     public function transform(User $user): array
     {
-        return $user->toArray();
+        return [
+            'id' => $user->id,
+            'external_id' => $user->external_id,
+            'uuid' => $user->uuid,
+            'username' => $user->username,
+            'email' => $user->email,
+            'first_name' => $user->name_first,
+            'last_name' => $user->name_last,
+            'language' => $user->language,
+            'root_admin' => (bool) $user->root_admin,
+            '2fa' => (bool) $user->use_totp,
+            'created_at' => $this->formatTimestamp($user->created_at),
+            'updated_at' => $this->formatTimestamp($user->updated_at),
+        ];
     }
 
     /**

app/Transformers/Api/Application/UserTransformer.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AllowTextInUserExternalId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('external_id')->nullable()->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->unsignedInteger('external_id')->change();
+        });
+    }
+}

database/migrations/2018_02_04_145617_AllowTextInUserExternalId.php

@@ -10,7 +10,7 @@
 */
 Route::group(['prefix' => '/users'], function () {
     Route::get('/', 'Users\UserController@index')->name('api.application.users');
-    Route::get('/{user}', 'Users\UserController@view')->name('api.applications.users.view');
+    Route::get('/{user}', 'Users\UserController@view')->name('api.application.users.view');
 
     Route::post('/', 'Users\UserController@store');
     Route::patch('/{user}', 'Users\UserController@update');