replace manual json headers with laravel response()->json()
better Carbon dependency rename admin.nodes.configuration-token route style fixes
This commit is contained in:
parent
67bb8fe230
commit
9f2ca17ea4
5 changed files with 8 additions and 11 deletions
|
@ -27,8 +27,8 @@ namespace Pterodactyl\Http\Controllers\Admin;
|
|||
use DB;
|
||||
use Log;
|
||||
use Alert;
|
||||
use Carbon;
|
||||
use Validator;
|
||||
use Carbon\Carbon;
|
||||
use Pterodactyl\Models;
|
||||
use Illuminate\Http\Request;
|
||||
use Pterodactyl\Exceptions\DisplayException;
|
||||
|
@ -296,7 +296,6 @@ class NodesController extends Controller
|
|||
'expires_at' => $token->expires_at->toDateTimeString(),
|
||||
];
|
||||
|
||||
return response(json_encode($token_response), 200)
|
||||
->header('Content-Type', 'application/json');
|
||||
return response()->json($token_response, 200);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -116,21 +116,20 @@ class RemoteController extends Controller
|
|||
$token = Models\NodeConfigurationToken::where('token', $tokenString)->firstOrFail();
|
||||
$node = Models\Node::findOrFail($token->node);
|
||||
} catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
|
||||
return response(json_encode(['error' => 'token_invalid']), 403)
|
||||
->header('Content-Type', 'application/json');
|
||||
return response()->json(['error' => 'token_invalid'], 403);
|
||||
}
|
||||
|
||||
// Check if token is expired
|
||||
if ($token->expires_at->lt(Carbon::now())) {
|
||||
$token->delete();
|
||||
|
||||
return response(json_encode(['error' => 'token_expired']), 403)
|
||||
->header('Content-Type', 'application/json');
|
||||
return response()->json(['error' => 'token_expired'], 403);
|
||||
}
|
||||
|
||||
// Delete the token, it's one-time use
|
||||
$token->delete();
|
||||
|
||||
// Manually as getConfigurationAsJson() returns it in correct format already
|
||||
return response($node->getConfigurationAsJson(), 200)
|
||||
->header('Content-Type', 'application/json');
|
||||
}
|
||||
|
|
|
@ -288,7 +288,7 @@ class AdminRoutes
|
|||
]);
|
||||
|
||||
$router->get('/{id}/configurationtoken', [
|
||||
'as' => 'admin.nodes.configurationtoken',
|
||||
'as' => 'admin.nodes.configuration-token',
|
||||
'uses' => 'Admin\NodesController@getConfigurationToken',
|
||||
]);
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue