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

More service structure testing and configuration

Browse source 
Tests aren't working as well as I had hoped, so a lot are commented out while I wait to hear back on this bug causing them to fail.
This commit is contained in:
Dane Everitt 2017-06-24 19:49:09 -05:00
parent ce2b2447d0
commit 2235481765
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
18 changed files with 755 additions and 401 deletions
Download patch file Download diff file Expand all files Collapse all files

26
app/Http/Controllers/Admin/UserController.php
View file

@ -47,20 +47,20 @@ class UserController extends Controller
/**
* @var \Pterodactyl\Models\User
*/
protected $userModel;
protected $model;
/**
* UserController constructor.
*
* @param \Prologue\Alerts\AlertsMessageBag $alert
* @param \Pterodactyl\Services\UserService $service
* @param \Pterodactyl\Models\User $userModel
* @param \Pterodactyl\Models\User $model
*/
public function __construct(AlertsMessageBag $alert, UserService $service, User $userModel)
public function __construct(AlertsMessageBag $alert, UserService $service, User $model)
{
$this->alert = $alert;
$this->service = $service;
$this->userModel = $userModel;
$this->model = $model;
}
/**
@ -71,7 +71,7 @@ class UserController extends Controller
*/
public function index(Request $request)
{
$users = $this->userModel->withCount('servers', 'subuserOf');
$users = $this->model->newQuery()->withCount('servers', 'subuserOf');
if (! is_null($request->input('query'))) {
$users->search($request->input('query'));
@ -108,13 +108,19 @@ class UserController extends Controller
/**
* Delete a user from the system.
*
* @param \Illuminate\Http\Request $request
* @param \Pterodactyl\Models\User $user
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Exception
* @throws \Pterodactyl\Exceptions\DisplayException
*/
public function delete(User $user)
public function delete(Request $request, User $user)
{
if ($request->user()->id === $user->id) {
throw new DisplayException('Cannot delete your own account.');
}
try {
$this->service->delete($user->id);
@ -146,9 +152,11 @@ class UserController extends Controller
/**
* Update a user on the system.
*
* @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request
* @param \Pterodactyl\Models\User $user
* @param \Pterodactyl\Http\Requests\Admin\UserFormRequest $request
* @param \Pterodactyl\Models\User $user
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
public function update(UserFormRequest $request, User $user)
{
@ -166,7 +174,7 @@ class UserController extends Controller
*/
public function json(Request $request)
{
return $this->userModel->search($request->input('q'))->all([
return $this->model->search($request->input('q'))->all([
'id', 'email', 'username', 'name_first', 'name_last',
])->transform(function ($item) {
$item->md5 = md5(strtolower($item->email));