StarMC/Astral-nook
StarMC/Astral-nook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update last of existing services to use repositories, includes unit tests

Browse source 
Also update PHPDocs on all the repository interfaces and classes to be correct.
This commit is contained in:
Dane Everitt 2017-07-08 14:07:51 -05:00
parent 50588a1f54
commit 0deb022093
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
21 changed files with 808 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

65
app/Services/ApiKeyService.php
View file

@ -24,48 +24,52 @@
namespace Pterodactyl\Services;
use Pterodactyl\Models\APIKey;
use Illuminate\Database\Connection;
use Illuminate\Database\ConnectionInterface;
use Illuminate\Contracts\Encryption\Encrypter;
use Pterodactyl\Exceptions\Model\DataValidationException;
use Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface;
class ApiKeyService
{
const PUB_CRYPTO_BYTES = 8;
const PRIV_CRYPTO_BYTES = 32;
/**
* @var \Illuminate\Database\ConnectionInterface
*/
protected $database;
/**
* @var \Illuminate\Contracts\Encryption\Encrypter
*/
protected $encrypter;
/**
* @var \Pterodactyl\Models\APIKey
*/
protected $model;
/**
* @var \Pterodactyl\Services\ApiPermissionService
*/
protected $permissionService;
/**
* @var \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface
*/
protected $repository;
/**
* ApiKeyService constructor.
*
* @param \Pterodactyl\Models\APIKey $model
* @param \Illuminate\Database\Connection $database
* @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
* @param \Pterodactyl\Services\ApiPermissionService $permissionService
* @param \Pterodactyl\Contracts\Repository\ApiKeyRepositoryInterface $repository
* @param \Illuminate\Database\ConnectionInterface $database
* @param \Illuminate\Contracts\Encryption\Encrypter $encrypter
* @param \Pterodactyl\Services\ApiPermissionService $permissionService
*/
public function __construct(
APIKey $model,
Connection $database,
ApiKeyRepositoryInterface $repository,
ConnectionInterface $database,
Encrypter $encrypter,
ApiPermissionService $permissionService
) {
$this->repository = $repository;
$this->database = $database;
$this->encrypter = $encrypter;
$this->model = $model;
$this->permissionService = $permissionService;
}
@ -88,16 +92,12 @@ class ApiKeyService
// Start a Transaction
$this->database->beginTransaction();
$instance = $this->model->newInstance($data);
$instance->public = $publicKey;
$instance->secret = $this->encrypter->encrypt($secretKey);
$data = array_merge($data, [
'public' => $publicKey,
'secret' => $this->encrypter->encrypt($secretKey),
]);
if (! $instance->save()) {
$this->database->rollBack();
throw new DataValidationException($instance->getValidator());
}
$key = $instance->fresh();
$instance = $this->repository->create($data, true, true);
$nodes = $this->permissionService->getPermissions();
foreach ($permissions as $permission) {
@ -111,7 +111,7 @@ class ApiKeyService
continue;
}
$this->permissionService->create($key->id, sprintf('user.%s', $permission));
$this->permissionService->create($instance->id, sprintf('user.%s', $permission));
}
foreach ($administrative as $permission) {
@ -125,7 +125,7 @@ class ApiKeyService
continue;
}
$this->permissionService->create($key->id, $permission);
$this->permissionService->create($instance->id, $permission);
}
$this->database->commit();
@ -136,18 +136,11 @@ class ApiKeyService
/**
* Delete the API key and associated permissions from the database.
*
* @param int|\Pterodactyl\Models\APIKey $key
* @param int $id
* @return bool|null
*
* @throws \Exception
* @throws \Illuminate\Database\Eloquent\ModelNotFoundException
*/
public function revoke($key)
public function revoke($id)
{
if (! $key instanceof APIKey) {
$key = $this->model->findOrFail($key);
}
return $key->delete();
return $this->repository->delete($id);
}
}

24
app/Services/ApiPermissionService.php
View file

@ -24,24 +24,23 @@
namespace Pterodactyl\Services;
use Pterodactyl\Models\APIPermission;
use Pterodactyl\Exceptions\Model\DataValidationException;
use Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface;
class ApiPermissionService
{
/**
* @var \Pterodactyl\Models\APIPermission
* @var \Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface
*/
protected $model;
protected $repository;
/**
* ApiPermissionService constructor.
*
* @param \Pterodactyl\Models\APIPermission $model
* @param \Pterodactyl\Contracts\Repository\ApiPermissionRepositoryInterface $repository
*/
public function __construct(APIPermission $model)
public function __construct(ApiPermissionRepositoryInterface $repository)
{
$this->model = $model;
$this->repository = $repository;
}
/**
@ -55,16 +54,11 @@ class ApiPermissionService
*/
public function create($key, $permission)
{
$instance = $this->model->newInstance([
// @todo handle an array of permissions to do a mass assignment?
return $this->repository->withoutFresh()->create([
'key_id' => $key,
'permission' => $permission,
]);
if (! $instance->save()) {
throw new DataValidationException($instance->getValidator());
}
return true;
}
/**
@ -74,6 +68,6 @@ class ApiPermissionService
*/
public function getPermissions()
{
return APIPermission::PERMISSIONS;
return $this->repository->getModel()::CONST_PERMISSIONS;
}
}