Add initial basic API changes

New route is `/api/me`
This commit is contained in:
Dane Everitt 2016-10-14 20:22:23 -04:00
parent 126df09152
commit 745c735b32
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
17 changed files with 587 additions and 40 deletions

View file

@ -24,7 +24,6 @@
namespace Pterodactyl\Models;
use Auth;
use Pterodactyl\Models\Subuser;
use Illuminate\Database\Eloquent\Model;
@ -91,7 +90,11 @@ class Server extends Model
*/
public function __construct()
{
self::$user = Auth::user();
if (!is_null(Auth::user())) {
self::$user = Auth::user();
} else {
throw new \Exception('Auth::user and Dingo::user cannot both be null.');
}
}
/**
@ -133,9 +136,13 @@ class Server extends Model
'locations.short as a_locationShort',
'allocations.ip',
'allocations.ip_alias',
'allocations.port'
'allocations.port',
'services.name as a_serviceName',
'service_options.name as a_serviceOptionName'
)->join('nodes', 'servers.node', '=', 'nodes.id')
->join('locations', 'nodes.location', '=', 'locations.id')
->join('services', 'servers.service', '=', 'services.id')
->join('service_options', 'servers.option', '=', 'service_options.id')
->join('allocations', 'servers.allocation', '=', 'allocations.id');
if (self::$user->root_admin !== 1) {

View file

@ -70,7 +70,11 @@ class Subuser extends Model
*/
public function __construct()
{
self::$user = Auth::user();
if (!is_null(Auth::user())) {
self::$user = Auth::user();
} else {
throw new \Exception('Auth::user and Dingo::user cannot both be null.');
}
}
/**