First round of API additions

This commit is contained in:
Dane Everitt 2017-11-19 16:30:00 -06:00
parent bf9708fe4f
commit 698c121e11
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
8 changed files with 229 additions and 142 deletions

View file

@ -168,9 +168,10 @@ interface RepositoryInterface
/**
* Return all records from the model.
*
* @param null $paginate
* @return mixed
*/
public function all();
public function all($paginate = null);
/**
* Insert a single or multiple records into the database at once skipping

View file

@ -0,0 +1,73 @@
<?php
namespace Pterodactyl\Http\Controllers\API\Admin\Users;
use Spatie\Fractal\Fractal;
use Illuminate\Http\Request;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Transformers\Admin\UserTransformer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use Pterodactyl\Contracts\Repository\UserRepositoryInterface;
use Illuminate\Contracts\Config\Repository as ConfigRepository;
/**
* @SWG\Swagger(
* schemes={"https"},
* basePath="/api/admin/users"
* )
*/
class UserController extends Controller
{
/**
* @var \Spatie\Fractal\Fractal
*/
private $fractal;
/**
* @var \Pterodactyl\Contracts\Repository\UserRepositoryInterface
*/
private $repository;
/**
* @var \Illuminate\Contracts\Config\Repository
*/
private $config;
/**
* UserController constructor.
*
* @param \Illuminate\Contracts\Config\Repository $config
* @param \Spatie\Fractal\Fractal $fractal
* @param \Pterodactyl\Contracts\Repository\UserRepositoryInterface $repository
*/
public function __construct(
ConfigRepository $config,
Fractal $fractal,
UserRepositoryInterface $repository
) {
$this->fractal = $fractal;
$this->repository = $repository;
$this->config = $config;
}
/**
* Handle request to list all users on the panel.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function index(Request $request)
{
$users = $this->repository->all($this->config->get('pterodactyl.paginate.api.users'));
$fractal = $this->fractal->collection($users)
->transformWith(new UserTransformer($request))
->withResourceName('user')
->paginateWith(new IlluminatePaginatorAdapter($users));
if ($this->config->get('pterodactyl.api.include_on_list') && $request->input('include')) {
$fractal->parseIncludes(explode(',', $request->input('include')));
}
return $fractal->toArray();
}
}

View file

@ -89,7 +89,7 @@ class User extends Model implements
*
* @var array
*/
protected $hidden = ['password', 'remember_token', 'totp_secret'];
protected $hidden = ['password', 'remember_token', 'totp_secret', 'totp_authenticated_at'];
/**
* Parameters for search querying.

View file

@ -184,14 +184,20 @@ abstract class EloquentRepository extends Repository implements RepositoryInterf
/**
* {@inheritdoc}
*/
public function all()
public function all($paginate = null)
{
Assert::nullOrIntegerish($paginate, 'First argument passed to all must be null or integer, received %s.');
$instance = $this->getBuilder();
if (is_subclass_of(get_called_class(), SearchableInterface::class)) {
$instance = $instance->search($this->searchTerm);
}
return $instance->get($this->getColumns());
if (is_null($paginate)) {
return $instance->get($this->getColumns());
}
return $instance->paginate($paginate, $this->getColumns());
}
/**

View file

@ -1,57 +1,37 @@
<?php
/**
* Pterodactyl - Panel
* Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
*
* This software is licensed under the terms of the MIT license.
* https://opensource.org/licenses/MIT
*/
namespace Pterodactyl\Transformers\Admin;
use Illuminate\Http\Request;
use Pterodactyl\Models\User;
use League\Fractal\TransformerAbstract;
use Pterodactyl\Transformers\ApiTransformer;
class UserTransformer extends TransformerAbstract
class UserTransformer extends ApiTransformer
{
/**
* List of resources that can be included.
*
* @var array
*/
protected $availableIncludes = [
'access',
'servers',
];
/**
* The Illuminate Request object if provided.
*
* @var \Illuminate\Http\Request|bool
*/
protected $request;
protected $availableIncludes = ['servers'];
/**
* Setup request object for transformer.
*
* @param \Illuminate\Http\Request|bool $request
* @param \Illuminate\Http\Request $request
*/
public function __construct($request = false)
public function __construct(Request $request)
{
if (! $request instanceof Request && $request !== false) {
throw new DisplayException('Request passed to constructor must be of type Request or false.');
}
$this->request = $request;
}
/**
* Return a generic transformed subuser array.
*
* @param \Pterodactyl\Models\User $user
* @return array
*/
public function transform(User $user)
public function transform(User $user): array
{
return $user->toArray();
}
@ -59,28 +39,21 @@ class UserTransformer extends TransformerAbstract
/**
* Return the servers associated with this user.
*
* @return \Leauge\Fractal\Resource\Collection
* @param \Pterodactyl\Models\User $user
* @return bool|\League\Fractal\Resource\Collection
*
* @throws \Pterodactyl\Exceptions\PterodactylException
*/
public function includeServers(User $user)
{
if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {
return;
if ($this->authorize('server-list')) {
return false;
}
return $this->collection($user->servers, new ServerTransformer($this->request), 'server');
}
/**
* Return the servers that this user can access.
*
* @return \Leauge\Fractal\Resource\Collection
*/
public function includeAccess(User $user)
{
if ($this->request && ! $this->request->apiKeyHasPermission('server-list')) {
return;
if (! $user->relationLoaded('servers')) {
$user->load('servers');
}
return $this->collection($user->access()->get(), new ServerTransformer($this->request), 'server');
return $this->collection($user->getRelation('servers'), new ServerTransformer($this->request), 'server');
}
}

View file

@ -0,0 +1,39 @@
<?php
namespace Pterodactyl\Transformers;
use League\Fractal\TransformerAbstract;
use Pterodactyl\Exceptions\PterodactylException;
abstract class ApiTransformer extends TransformerAbstract
{
/**
* @var \Illuminate\Http\Request
*/
protected $request;
/**
* Determine if an API key from the request has permission to access
* a resource. This is used when loading includes on the transformed
* models.
*
* @param string $permission
* @return bool
*
* @throws \Pterodactyl\Exceptions\PterodactylException
*/
protected function authorize(string $permission): bool
{
/** @var \Pterodactyl\Models\APIKey $model */
$model = $this->request->attributes->get('api_key');
if (! $model->relationLoaded('permissions')) {
throw new PterodactylException('Permissions must be loaded onto a model before passing to transformer authorize function.');
}
$count = $model->getRelation('permissions')->filter(function ($model) use ($permission) {
return $model->permission === $permission;
})->count();
return $count > 0;
}
}