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

Fix Node daemon secret not being reset, closes #1390

Browse source
This commit is contained in:
Dane Everitt 2018-12-02 13:38:59 -08:00
parent 4d8760f335
commit 7c73f21b30
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
4 changed files with 44 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/Admin/NodesController.php
View file

@ -263,7 +263,7 @@ class NodesController extends Controller
*/
public function updateSettings(NodeFormRequest $request, Node $node)
{
$this->updateService->handle($node, $request->normalize());
$this->updateService->handle($node, $request->normalize(), $request->input('reset_secret') === 'on');
$this->alert->success(trans('admin/node.notices.node_updated'))->flash();
return redirect()->route('admin.nodes.view.settings', $node->id)->withInput();
@ -289,7 +289,7 @@ class NodesController extends Controller
* Removes multiple individual allocations from a node.
*
* @param \Illuminate\Http\Request $request
* @param int $node
* @param int $node
* @return \Illuminate\Http\Response
*
* @throws \Pterodactyl\Exceptions\Service\Allocation\ServerUsingAllocationException

2
app/Http/Controllers/Api/Application/Nodes/NodeController.php
View file

@ -125,7 +125,7 @@ class NodeController extends ApplicationApiController
public function update(UpdateNodeRequest $request): array
{
$node = $this->updateService->handle(
$request->getModel(Node::class), $request->validated()
$request->getModel(Node::class), $request->validated(), $request->input('reset_secret') === true
);
return $this->fractal->item($node)