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

Merge branch 'develop' into enhancement/wings-improved-server-loading

Browse source
This commit is contained in:
Matthew Penner 2020-04-10 16:23:46 -06:00 • committed by GitHub
commit 94d46affb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
57 changed files with 602 additions and 1101 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php
View file

@ -145,7 +145,7 @@ class ServerTransferController extends Controller
->canOnlyBeUsedAfter($now->getTimestamp())
->expiresAt($now->addMinutes(15)->getTimestamp())
->relatedTo($server->uuid, true)
->getToken($signer, new Key($server->node->daemonSecret));
->getToken($signer, new Key($server->node->getDecryptedKey()));
// On the daemon transfer repository, make sure to set the node after the server
// because setServer() tells the repository to use the server's node and not the one