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

Add unit tests for API key controller

Browse source
This commit is contained in:
Dane Everitt 2017-09-02 00:21:15 -05:00
parent cb62e6a96d
commit 53d1182645
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 225 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Base/APIController.php
View file

@ -93,7 +93,7 @@ class APIController extends Controller
return view('base.api.new', [
'permissions' => [
'user' => collect(APIPermission::CONST_PERMISSIONS)->pull('_user'),
'admin' => ! $request->user()->root_admin ?: collect(APIPermission::CONST_PERMISSIONS)->except('_user')->toArray(),
'admin' => ! $request->user()->root_admin ? null : collect(APIPermission::CONST_PERMISSIONS)->except('_user')->toArray(),
],
]);
}
@ -103,6 +103,7 @@ class APIController extends Controller
*
* @param \Pterodactyl\Http\Requests\Base\ApiKeyFormRequest $request
* @return \Illuminate\Http\RedirectResponse
*
* @throws \Exception
* @throws \Pterodactyl\Exceptions\Model\DataValidationException
*/
@ -110,7 +111,7 @@ class APIController extends Controller
{
$adminPermissions = [];
if ($request->user()->root_admin) {
$adminPermissions = $request->input('admin_permissions') ?? [];
$adminPermissions = $request->input('admin_permissions', []);
}
$secret = $this->keyService->handle([