fix styleci issues

This commit is contained in:
Jakob Schrettenbrunner 2017-01-07 18:39:41 +01:00
parent cc0d54e906
commit a661f71974
3 changed files with 43 additions and 39 deletions

View file

@ -279,7 +279,8 @@ class NodesController extends Controller
]);
}
public function getConfigurationToken(Request $request, $id) {
public function getConfigurationToken(Request $request, $id)
{
// Check if Node exists. Will lead to 404 if not.
Models\Node::findOrFail($id);
@ -290,10 +291,10 @@ class NodesController extends Controller
$token->expires_at = Carbon::now()->addMinutes(5); // Expire in 5 Minutes
$token->save();
$token_response = array(
$token_response = [
'token' => $token->token,
'expires_at' => $token->expires_at->toDateTimeString()
);
'expires_at' => $token->expires_at->toDateTimeString(),
];
return response(json_encode($token_response), 200)
->header('Content-Type', 'application/json');

View file

@ -29,7 +29,6 @@ use Pterodactyl\Models;
use Illuminate\Http\Request;
use Pterodactyl\Http\Controllers\Controller;
use Pterodactyl\Services\NotificationService;
use Pterodactyl\Models\NodeConfigurationToken;
class RemoteController extends Controller
{
@ -110,20 +109,21 @@ class RemoteController extends Controller
return response('', 201);
}
public function getConfiguration(Request $request, $tokenString) {
public function getConfiguration(Request $request, $tokenString)
{
// Try to query the token and the node from the database
try {
$token = Models\NodeConfigurationToken::where('token', $tokenString)->firstOrFail();
$node = Models\Node::findOrFail($token->node);
} catch(\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
return response(json_encode(array('error' => 'token_invalid')), 403)
} catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
return response(json_encode(['error' => 'token_invalid']), 403)
->header('Content-Type', 'application/json');
}
// Check if token is expired
if ($token->expires_at->lt(Carbon::now())) {
$token->delete();
return response(json_encode(array('error' => 'token_expired')), 403)
return response(json_encode(['error' => 'token_expired']), 403)
->header('Content-Type', 'application/json');
}