Fix all currently failing tests

Author: DaneEveritt

app/Services/Servers/DetailsModificationService.php

@@ -54,7 +54,7 @@ class DetailsModificationService
     /**
      * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService
      */
-    private $keyDeletionService;
+    protected $keyDeletionService;
 
     /**
      * @var \Pterodactyl\Repositories\Eloquent\ServerRepository

app/Services/Subusers/SubuserCreationService.php

@@ -76,27 +76,27 @@ class SubuserCreationService
      * SubuserCreationService constructor.
      *
      * @param \Illuminate\Database\ConnectionInterface                     $connection
-     * @param \Pterodactyl\Services\Users\UserCreationService              $userCreationService
      * @param \Pterodactyl\Services\DaemonKeys\DaemonKeyCreationService    $keyCreationService
      * @param \Pterodactyl\Services\Subusers\PermissionCreationService     $permissionService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface  $serverRepository
      * @param \Pterodactyl\Contracts\Repository\SubuserRepositoryInterface $subuserRepository
+     * @param \Pterodactyl\Services\Users\UserCreationService              $userCreationService
      * @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface    $userRepository
      */
     public function __construct(
         ConnectionInterface $connection,
-        UserCreationService $userCreationService,
         DaemonKeyCreationService $keyCreationService,
         PermissionCreationService $permissionService,
         ServerRepositoryInterface $serverRepository,
         SubuserRepositoryInterface $subuserRepository,
+        UserCreationService $userCreationService,
         UserRepositoryInterface $userRepository
     ) {
         $this->connection = $connection;
         $this->keyCreationService = $keyCreationService;
         $this->permissionService = $permissionService;
-        $this->subuserRepository = $subuserRepository;
         $this->serverRepository = $serverRepository;
+        $this->subuserRepository = $subuserRepository;
         $this->userRepository = $userRepository;
         $this->userCreationService = $userCreationService;
     }

app/Services/Subusers/SubuserDeletionService.php

@@ -24,6 +24,7 @@
 
 namespace Pterodactyl\Services\Subusers;
 
+use Pterodactyl\Models\Subuser;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Services\DaemonKeys\DaemonKeyDeletionService;
 use Pterodactyl\Contracts\Repository\SubuserRepositoryInterface;
@@ -65,14 +66,16 @@ public function __construct(
     /**
      * Delete a subuser and their associated permissions from the Panel and Daemon.
      *
-     * @param int $subuser
+     * @param int|\Pterodactyl\Models\Subuser $subuser
      *
      * @throws \Pterodactyl\Exceptions\DisplayException
      * @throws \Pterodactyl\Exceptions\Repository\RecordNotFoundException
      */
     public function handle($subuser)
     {
-        $subuser = $this->repository->getWithServer($subuser);
+        if (! $subuser instanceof Subuser) {
+            $subuser = $this->repository->find($subuser);
+        }
 
         $this->connection->beginTransaction();
         $this->keyDeletionService->handle($subuser->server_id, $subuser->user_id);

database/factories/ModelFactory.php

@@ -30,7 +30,6 @@
         'cpu' => 0,
         'oom_disabled' => 0,
         'pack_id' => null,
-        'daemonSecret' => $faker->uuid,
         'username' => $faker->userName,
         'sftp_password' => null,
         'installed' => 1,
@@ -153,7 +152,6 @@
         'id' => $faker->unique()->randomNumber(),
         'user_id' => $faker->randomNumber(),
         'server_id' => $faker->randomNumber(),
-        'daemonSecret' => $faker->unique()->uuid,
     ];
 });
 
@@ -197,3 +195,13 @@
         'is_queued' => false,
     ];
 });
+
+$factory->define(Pterodactyl\Models\DaemonKey::class, function (Faker\Generator $faker) {
+    return [
+        'id' => $faker->unique()->randomNumber(),
+        'server_id' => $faker->randomNumber(),
+        'user_id' => $faker->randomNumber(),
+        'secret' => 'i_' . str_random(40),
+        'expires_at' => \Carbon\Carbon::now()->addMinutes(10)->toDateTimeString(),
+    ];
+});

tests/Unit/Http/Controllers/Base/IndexControllerTest.php

@@ -31,36 +31,36 @@
 use Pterodactyl\Models\Server;
 use Tests\Assertions\ControllerAssertionsTrait;
 use Pterodactyl\Http\Controllers\Base\IndexController;
-use Pterodactyl\Services\Servers\ServerAccessHelperService;
+use Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService;
 use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
 use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepositoryInterface;
 
 class IndexControllerTest extends TestCase
 {
     use ControllerAssertionsTrait;
 
-    /**
-     * @var \Pterodactyl\Services\Servers\ServerAccessHelperService
-     */
-    protected $access;
-
     /**
      * @var \Pterodactyl\Http\Controllers\Base\IndexController
      */
     protected $controller;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $daemonRepository;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface
+     * @var \Pterodactyl\Services\DaemonKeys\DaemonKeyProviderService|\Mockery\Mock
+     */
+    protected $keyProviderService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
     /**
-     * @var \Illuminate\Http\Request
+     * @var \Illuminate\Http\Request|\Mockery\Mock
      */
     protected $request;
 
@@ -71,12 +71,12 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->access = m::mock(ServerAccessHelperService::class);
         $this->daemonRepository = m::mock(DaemonServerRepositoryInterface::class);
+        $this->keyProviderService = m::mock(DaemonKeyProviderService::class);
         $this->repository = m::mock(ServerRepositoryInterface::class);
         $this->request = m::mock(Request::class);
 
-        $this->controller = new IndexController($this->daemonRepository, $this->access, $this->repository);
+        $this->controller = new IndexController($this->keyProviderService, $this->daemonRepository, $this->repository);
     }
 
     /**
@@ -109,16 +109,17 @@ public function testStatusController()
         $server = factory(Server::class)->make(['suspended' => 0, 'installed' => 1]);
 
         $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn($user);
-        $this->access->shouldReceive('handle')->with($server->uuid, $user)->once()->andReturn($server);
+        $this->repository->shouldReceive('findFirstWhere')->with([['uuidShort', '=', $server->uuidShort]])->once()->andReturn($server);
+        $this->keyProviderService->shouldReceive('handle')->with($server->id, $user->id)->once()->andReturn('test123');
 
         $this->daemonRepository->shouldReceive('setNode')->with($server->node_id)->once()->andReturnSelf()
             ->shouldReceive('setAccessServer')->with($server->uuid)->once()->andReturnSelf()
-            ->shouldReceive('setAccessToken')->with($server->daemonSecret)->once()->andReturnSelf()
+            ->shouldReceive('setAccessToken')->with('test123')->once()->andReturnSelf()
             ->shouldReceive('details')->withNoArgs()->once()->andReturnSelf();
 
         $this->daemonRepository->shouldReceive('getBody')->withNoArgs()->once()->andReturn('["test"]');
 
-        $response = $this->controller->status($this->request, $server->uuid);
+        $response = $this->controller->status($this->request, $server->uuidShort);
         $this->assertIsJsonResponse($response);
         $this->assertResponseJsonEquals(['test'], $response);
     }
@@ -132,9 +133,10 @@ public function testStatusControllerWhenServerNotInstalled()
         $server = factory(Server::class)->make(['suspended' => 0, 'installed' => 0]);
 
         $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn($user);
-        $this->access->shouldReceive('handle')->with($server->uuid, $user)->once()->andReturn($server);
+        $this->repository->shouldReceive('findFirstWhere')->with([['uuidShort', '=', $server->uuidShort]])->once()->andReturn($server);
+        $this->keyProviderService->shouldReceive('handle')->with($server->id, $user->id)->once()->andReturn('test123');
 
-        $response = $this->controller->status($this->request, $server->uuid);
+        $response = $this->controller->status($this->request, $server->uuidShort);
         $this->assertIsJsonResponse($response);
         $this->assertResponseCodeEquals(200, $response);
         $this->assertResponseJsonEquals(['status' => 20], $response);
@@ -149,9 +151,10 @@ public function testStatusControllerWhenServerIsSuspended()
         $server = factory(Server::class)->make(['suspended' => 1, 'installed' => 1]);
 
         $this->request->shouldReceive('user')->withNoArgs()->once()->andReturn($user);
-        $this->access->shouldReceive('handle')->with($server->uuid, $user)->once()->andReturn($server);
+        $this->repository->shouldReceive('findFirstWhere')->with([['uuidShort', '=', $server->uuidShort]])->once()->andReturn($server);
+        $this->keyProviderService->shouldReceive('handle')->with($server->id, $user->id)->once()->andReturn('test123');
 
-        $response = $this->controller->status($this->request, $server->uuid);
+        $response = $this->controller->status($this->request, $server->uuidShort);
         $this->assertIsJsonResponse($response);
         $this->assertResponseCodeEquals(200, $response);
         $this->assertResponseJsonEquals(['status' => 30], $response);

tests/Unit/Services/Nodes/NodeUpdateServiceTest.php

@@ -41,12 +41,12 @@ class NodeUpdateServiceTest extends TestCase
     use PHPMock;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ConfigurationRepositoryInterface|\Mockery\Mock
      */
     protected $configRepository;
 
     /**
-     * @var \GuzzleHttp\Exception\RequestException
+     * @var \GuzzleHttp\Exception\RequestException|\Mockery\Mock
      */
     protected $exception;
 
@@ -56,7 +56,7 @@ class NodeUpdateServiceTest extends TestCase
     protected $node;
 
     /**
-     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface
+     * @var \Pterodactyl\Contracts\Repository\NodeRepositoryInterface|\Mockery\Mock
      */
     protected $repository;
 
@@ -66,7 +66,7 @@ class NodeUpdateServiceTest extends TestCase
     protected $service;
 
     /**
-     * @var \Illuminate\Log\Writer
+     * @var \Illuminate\Log\Writer|\Mockery\Mock
      */
     protected $writer;
 
@@ -106,7 +106,6 @@ public function testNodeIsUpdatedAndDaemonSecretIsReset()
             ])->andReturn(true);
 
         $this->configRepository->shouldReceive('setNode')->with($this->node->id)->once()->andReturnSelf()
-            ->shouldReceive('setAccessToken')->with($this->node->daemonSecret)->once()->andReturnSelf()
             ->shouldReceive('update')->withNoArgs()->once()->andReturnNull();
 
         $this->assertTrue($this->service->handle($this->node, ['name' => 'NewName', 'reset_secret' => true]));
@@ -123,7 +122,6 @@ public function testNodeIsUpdatedAndDaemonSecretIsNotChanged()
             ])->andReturn(true);
 
         $this->configRepository->shouldReceive('setNode')->with($this->node->id)->once()->andReturnSelf()
-            ->shouldReceive('setAccessToken')->with($this->node->daemonSecret)->once()->andReturnSelf()
             ->shouldReceive('update')->withNoArgs()->once()->andReturnNull();
 
         $this->assertTrue($this->service->handle($this->node, ['name' => 'NewName']));
@@ -167,7 +165,6 @@ public function testFunctionCanAcceptANodeIdInPlaceOfModel()
             ])->andReturn(true);
 
         $this->configRepository->shouldReceive('setNode')->with($this->node->id)->once()->andReturnSelf()
-            ->shouldReceive('setAccessToken')->with($this->node->daemonSecret)->once()->andReturnSelf()
             ->shouldReceive('update')->withNoArgs()->once()->andReturnNull();
 
         $this->assertTrue($this->service->handle($this->node->id, ['name' => 'NewName']));