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

add ?daemon=true option to API for servers

Browse source
This commit is contained in:
Dane Everitt 2016-10-06 23:56:32 -04:00
parent fbfaec6b20
commit 06756af994
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
3 changed files with 39 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/Http/Controllers/API/ServerController.php
View file

@ -62,8 +62,7 @@ class ServerController extends BaseController
*/
public function list(Request $request)
{
$servers = Models\Server::paginate(50);
return $this->response->paginator($servers, new ServerTransformer);
return Models\Server::all()->toArray();
}
/**
@ -120,9 +119,41 @@ class ServerController extends BaseController
if (!$query->first()) {
throw new NotFoundHttpException('No server by that ID was found.');
}
return $query->first();
// Requested Daemon Stats
$server = $query->first();
if ($request->input('daemon') === 'true') {
$node = Models\Node::findOrFail($server->node);
$client = Models\Node::guzzleRequest($node->id);
$response = $client->request('GET', '/servers', [
'headers' => [
'X-Access-Token' => $node->daemonSecret
]
]);
$server->toArray();
// Only return the daemon token if the request is using HTTPS
if ($request->secure()) {
$server->daemon_token = $server->daemonSecret;
}
$server->daemon = json_decode($response->getBody())->{$server->uuid};
return $server;
}
return $server;
} catch (NotFoundHttpException $ex) {
throw $ex;
} catch (\GuzzleHttp\Exception\TransferException $ex) {
// Couldn't hit the daemon, return what we have though.
$server->toArray();
$server->daemon = [
'error' => 'There was an error encountered while attempting to connect to the remote daemon.'
];
return $server;
} catch (\Exception $ex) {
throw new BadRequestHttpException('There was an issue with the fields passed in the request.');
}