diff --git a/app/Http/Controllers/Api/Client/Servers/DownloadBackupController.php b/app/Http/Controllers/Api/Client/Servers/DownloadBackupController.php index 0bb506d8..0c6d09ce 100644 --- a/app/Http/Controllers/Api/Client/Servers/DownloadBackupController.php +++ b/app/Http/Controllers/Api/Client/Servers/DownloadBackupController.php @@ -128,7 +128,7 @@ class DownloadBackupController extends ClientApiController protected function getLocalBackupUrl(Backup $backup, Server $server, User $user) { $token = $this->jwtService - ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)->toDateTimeImmutable()) + ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)) ->setClaims([ 'backup_uuid' => $backup->uuid, 'server_uuid' => $server->uuid, diff --git a/app/Http/Controllers/Api/Client/Servers/FileController.php b/app/Http/Controllers/Api/Client/Servers/FileController.php index b3bf6918..7597c0b0 100644 --- a/app/Http/Controllers/Api/Client/Servers/FileController.php +++ b/app/Http/Controllers/Api/Client/Servers/FileController.php @@ -113,7 +113,7 @@ class FileController extends ClientApiController public function download(GetFileContentsRequest $request, Server $server) { $token = $this->jwtService - ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)->toDateTimeImmutable()) + ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)) ->setClaims([ 'file_path' => rawurldecode($request->get('file')), 'server_uuid' => $server->uuid, diff --git a/app/Http/Controllers/Api/Client/Servers/FileUploadController.php b/app/Http/Controllers/Api/Client/Servers/FileUploadController.php index bcaec9ba..3ba84362 100644 --- a/app/Http/Controllers/Api/Client/Servers/FileUploadController.php +++ b/app/Http/Controllers/Api/Client/Servers/FileUploadController.php @@ -58,7 +58,7 @@ class FileUploadController extends ClientApiController protected function getUploadUrl(Server $server, User $user) { $token = $this->jwtService - ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)->toDateTimeImmutable()) + ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)) ->setClaims([ 'server_uuid' => $server->uuid, ]) diff --git a/app/Http/Controllers/Api/Client/Servers/WebsocketController.php b/app/Http/Controllers/Api/Client/Servers/WebsocketController.php index 9003463b..b1a82f53 100644 --- a/app/Http/Controllers/Api/Client/Servers/WebsocketController.php +++ b/app/Http/Controllers/Api/Client/Servers/WebsocketController.php @@ -73,7 +73,7 @@ class WebsocketController extends ClientApiController } $token = $this->jwtService - ->setExpiresAt(CarbonImmutable::now()->addMinutes(10)->toDateTimeImmutable()) + ->setExpiresAt(CarbonImmutable::now()->addMinutes(10)) ->setClaims([ 'user_id' => $request->user()->id, 'server_uuid' => $server->uuid, diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php index a68d7afe..8b0cf9d5 100644 --- a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php +++ b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php @@ -114,7 +114,7 @@ class ServerTransferController extends Controller // that node to communicate with the old node during the process to initiate the // actual file transfer. $token = $this->jwtService - ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)->toDateTimeImmutable()) + ->setExpiresAt(CarbonImmutable::now()->addMinutes(15)) ->setSubject($server->uuid) ->handle($server->node, $server->uuid, 'sha256'); diff --git a/app/Services/Nodes/NodeJWTService.php b/app/Services/Nodes/NodeJWTService.php index dbbf8a82..b22381fc 100644 --- a/app/Services/Nodes/NodeJWTService.php +++ b/app/Services/Nodes/NodeJWTService.php @@ -80,16 +80,15 @@ class NodeJWTService ->permittedFor($node->getConnectionAddress()) ->identifiedBy($identifier) ->withHeader('jti', $identifier) - ->issuedAt(CarbonImmutable::now()->toDateTimeImmutable()) - ->canOnlyBeUsedAfter(CarbonImmutable::now()->subMinutes(5)->toDateTimeImmutable()); + ->issuedAt(CarbonImmutable::now()) + ->canOnlyBeUsedAfter(CarbonImmutable::now()->subMinutes(5)); if ($this->expiresAt) { $builder = $builder->expiresAt($this->expiresAt); } if (! empty($this->subject)) { - $builder = $builder->relatedTo($this->subject) - ->withHeader('sub', $this->subject); + $builder = $builder->relatedTo($this->subject)->withHeader('sub', $this->subject); } foreach ($this->claims as $key => $value) {