banquise/pelican-panel-banquise
13
0
Fork 0
forked from banquise/pelican-panel-mirror
Code Issues 1 Pull Requests Actions Activity

Fix missed adjustments on http parameters

Browse Source
This commit is contained in:
NeonSpectrum 2024-04-19 11:29:35 +08:00
parent c4839708ce
commit 11e6430d42
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Repositories/Daemon/DaemonFileRepository.php
View File

@ -26,12 +26,11 @@ class DaemonFileRepository extends DaemonRepository
Assert::isInstanceOf($this->server, Server::class); Assert::isInstanceOf($this->server, Server::class);
try { try {
$response = $this->getHttpClient()->get( $response = $this->getHttpClient()
sprintf('/api/servers/%s/files/contents', $this->server->uuid), ->withQueryParameters(['file' => $path])
[ ->get(
'query' => ['file' => $path], sprintf('/api/servers/%s/files/contents', $this->server->uuid)
] );
);
} catch (ClientException|TransferException $exception) { } catch (ClientException|TransferException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception);
} }
@ -55,13 +54,12 @@ class DaemonFileRepository extends DaemonRepository
Assert::isInstanceOf($this->server, Server::class); Assert::isInstanceOf($this->server, Server::class);
try { try {
return $this->getHttpClient()->post( return $this->getHttpClient()
sprintf('/api/servers/%s/files/write', $this->server->uuid), ->withQueryParameters(['file' => $path])
[ ->withBody($content)
'query' => ['file' => $path], ->post(
'body' => $content, sprintf('/api/servers/%s/files/write', $this->server->uuid)
] );
);
} catch (TransferException $exception) { } catch (TransferException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception);
} }
@ -79,9 +77,7 @@ class DaemonFileRepository extends DaemonRepository
try { try {
$response = $this->getHttpClient()->get( $response = $this->getHttpClient()->get(
sprintf('/api/servers/%s/files/list-directory', $this->server->uuid), sprintf('/api/servers/%s/files/list-directory', $this->server->uuid),
[ ['directory' => $path]
'query' => ['directory' => $path],
]
); );
} catch (TransferException $exception) { } catch (TransferException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception);
@ -125,10 +121,8 @@ class DaemonFileRepository extends DaemonRepository
return $this->getHttpClient()->put( return $this->getHttpClient()->put(
sprintf('/api/servers/%s/files/rename', $this->server->uuid), sprintf('/api/servers/%s/files/rename', $this->server->uuid),
[ [
'json' => [ 'root' => $root ?? '/',
'root' => $root ?? '/', 'files' => $files,
'files' => $files,
],
] ]
); );
} catch (TransferException $exception) { } catch (TransferException $exception) {
@ -275,9 +269,7 @@ class DaemonFileRepository extends DaemonRepository
try { try {
return $this->getHttpClient()->post( return $this->getHttpClient()->post(
sprintf('/api/servers/%s/files/pull', $this->server->uuid), sprintf('/api/servers/%s/files/pull', $this->server->uuid),
[ array_filter($attributes, fn ($value) => !is_null($value))
array_filter($attributes, fn ($value) => !is_null($value)),
]
); );
} catch (TransferException $exception) { } catch (TransferException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception);

2
app/Repositories/Daemon/DaemonServerRepository.php
View File

@ -147,7 +147,7 @@ class DaemonServerRepository extends DaemonRepository
try { try {
$this->getHttpClient() $this->getHttpClient()
->post(sprintf('/api/servers/%s/ws/deny', $this->server->uuid), [ ->post(sprintf('/api/servers/%s/ws/deny', $this->server->uuid), [
'json' => ['jtis' => $jtis], 'jtis' => $jtis,
]); ]);
} catch (TransferException $exception) { } catch (TransferException $exception) {
throw new DaemonConnectionException($exception); throw new DaemonConnectionException($exception);