From 2adc8b3bf6cdffad987d3c58a80d74f59bc7286a Mon Sep 17 00:00:00 2001 From: Julie Lenaerts Date: Thu, 4 Jul 2024 11:58:48 +0200 Subject: [PATCH] Fix construct of SignedUrlPost --- .../Driver/OpenstackObjectStore/TempUrlOpenstackGenerator.php | 1 + src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php | 3 ++- .../OpenstackObjectStore/TempUrlOpenstackGeneratorTest.php | 1 + .../Tests/Controller/AsyncUploadControllerTest.php | 1 + .../Serializer/Normalizer/SignedUrlPostNormalizerTest.php | 2 ++ 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGenerator.php b/src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGenerator.php index 06f660fbe..ae74f9d0e 100644 --- a/src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGenerator.php +++ b/src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGenerator.php @@ -89,6 +89,7 @@ final readonly class TempUrlOpenstackGenerator implements TempUrlGeneratorInterf $g = new SignedUrlPost( $url = $this->generateUrl($object_name), $expires, + $object_name, $this->max_post_file_size, $max_file_count, $submit_delay, diff --git a/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php b/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php index 9d37771d1..e9aecf6b2 100644 --- a/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php +++ b/src/Bundle/ChillDocStoreBundle/AsyncUpload/SignedUrlPost.php @@ -18,6 +18,7 @@ readonly class SignedUrlPost extends SignedUrl public function __construct( string $url, \DateTimeImmutable $expires, + string $object_name, #[Serializer\Groups(['read'])] public int $max_file_size, #[Serializer\Groups(['read'])] @@ -31,6 +32,6 @@ readonly class SignedUrlPost extends SignedUrl #[Serializer\Groups(['read'])] public string $signature, ) { - parent::__construct('POST', $url, $expires); + parent::__construct('POST', $url, $expires, $object_name); } } diff --git a/src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGeneratorTest.php b/src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGeneratorTest.php index f9cc49fa6..bb83c698a 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGeneratorTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/AsyncUpload/Driver/OpenstackObjectStore/TempUrlOpenstackGeneratorTest.php @@ -154,6 +154,7 @@ class TempUrlOpenstackGeneratorTest extends TestCase $signedUrl = new SignedUrlPost( 'https://objectstore.example/v1/my_account/container/object?temp_url_sig=0aeef353a5f6e22d125c76c6ad8c644a59b222ba1b13eaeb56bf3d04e28b081d11dfcb36601ab3aa7b623d79e1ef03017071bbc842fb7b34afec2baff895bf80&temp_url_expires=1702043543', \DateTimeImmutable::createFromFormat('U', '1702043543'), + $objectName, 150, 1, 1800, diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Controller/AsyncUploadControllerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Controller/AsyncUploadControllerTest.php index da223cea6..4c7dc92d0 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Controller/AsyncUploadControllerTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Controller/AsyncUploadControllerTest.php @@ -73,6 +73,7 @@ class AsyncUploadControllerTest extends TestCase return new SignedUrlPost( 'https://object.store.example', new \DateTimeImmutable('1 hour'), + 'abc' 150, 1, 1800, diff --git a/src/Bundle/ChillDocStoreBundle/Tests/Serializer/Normalizer/SignedUrlPostNormalizerTest.php b/src/Bundle/ChillDocStoreBundle/Tests/Serializer/Normalizer/SignedUrlPostNormalizerTest.php index ceb777f23..3bfa279e5 100644 --- a/src/Bundle/ChillDocStoreBundle/Tests/Serializer/Normalizer/SignedUrlPostNormalizerTest.php +++ b/src/Bundle/ChillDocStoreBundle/Tests/Serializer/Normalizer/SignedUrlPostNormalizerTest.php @@ -38,6 +38,7 @@ class SignedUrlPostNormalizerTest extends KernelTestCase $signedUrl = new SignedUrlPost( 'https://object.store.example/container/object', \DateTimeImmutable::createFromFormat('U', '1700000'), + 'abc', 15000, 1, 180, @@ -59,6 +60,7 @@ class SignedUrlPostNormalizerTest extends KernelTestCase 'method' => 'POST', 'expires' => 1_700_000, 'url' => 'https://object.store.example/container/object', + 'object_name' => 'abc' ], $actual );