From 3f01dd3f9599fa077c58a2eaf77ac637dc61267e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=8Carodej?= Date: Tue, 22 Mar 2022 19:25:38 +0100 Subject: [PATCH] s3 multipart upload fix --- changelog.md | 2 +- composer.lock | 34 ++--- config/vuefilemanager.php | 2 +- public/mix-manifest.json | 140 +++++++++--------- .../MoveFileToExternalStorageAction.php | 9 +- 5 files changed, 91 insertions(+), 96 deletions(-) diff --git a/changelog.md b/changelog.md index 629903ad..3b80ab16 100644 --- a/changelog.md +++ b/changelog.md @@ -91,7 +91,7 @@ Login & Registration - Integrated database with more than 550 disposable temporary email services to automatically deny new account registrations - Users can now set up 2 factor verification with their favourite authenticator app - reCaptcha was added to provide security for your registration and contact form -- Social authentication was implemented with Facebook, Google and GitHub drivers +- Social authentication was implemented with Facebook, Google and GitHub drivers. Adsense - Adsense will be integrated into VueFileManager diff --git a/composer.lock b/composer.lock index 76302c90..c1046139 100644 --- a/composer.lock +++ b/composer.lock @@ -280,16 +280,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.215.0", + "version": "3.215.1", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "79c4ffdf93cdcc7be9196ae2e22f0d0323cb2557" + "reference": "32cb9c6ac53ef7eb773d645ce6eda308ff069c5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/79c4ffdf93cdcc7be9196ae2e22f0d0323cb2557", - "reference": "79c4ffdf93cdcc7be9196ae2e22f0d0323cb2557", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/32cb9c6ac53ef7eb773d645ce6eda308ff069c5e", + "reference": "32cb9c6ac53ef7eb773d645ce6eda308ff069c5e", "shasum": "" }, "require": { @@ -365,9 +365,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.215.0" + "source": "https://github.com/aws/aws-sdk-php/tree/3.215.1" }, - "time": "2022-03-18T18:16:01+00:00" + "time": "2022-03-21T18:18:55+00:00" }, { "name": "bacon/bacon-qr-code", @@ -2847,16 +2847,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "6565c7e0db3231e92dd5ca3bed448b30fbc89eb1" + "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/6565c7e0db3231e92dd5ca3bed448b30fbc89eb1", - "reference": "6565c7e0db3231e92dd5ca3bed448b30fbc89eb1", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/c94a94f120803a18554c1805ef2e539f8285f9a2", + "reference": "c94a94f120803a18554c1805ef2e539f8285f9a2", "shasum": "" }, "require": { @@ -2942,7 +2942,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.2.0" + "source": "https://github.com/guzzle/psr7/tree/2.2.1" }, "funding": [ { @@ -2958,7 +2958,7 @@ "type": "tidelift" } ], - "time": "2022-03-20T13:51:08+00:00" + "time": "2022-03-20T21:55:58+00:00" }, { "name": "intervention/image", @@ -14389,16 +14389,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "5b8c360d1f6bcba339a6d593efa02816c06d17c3" + "reference": "f3243fd99351e0a79df6886a5354d8dd88d6d0d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/5b8c360d1f6bcba339a6d593efa02816c06d17c3", - "reference": "5b8c360d1f6bcba339a6d593efa02816c06d17c3", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/f3243fd99351e0a79df6886a5354d8dd88d6d0d2", + "reference": "f3243fd99351e0a79df6886a5354d8dd88d6d0d2", "shasum": "" }, "require": { @@ -14472,7 +14472,7 @@ "type": "github" } ], - "time": "2022-03-19T17:03:56+00:00" + "time": "2022-03-21T07:13:26+00:00" }, { "name": "symfony/polyfill-php73", diff --git a/config/vuefilemanager.php b/config/vuefilemanager.php index 928897b6..d3709bff 100644 --- a/config/vuefilemanager.php +++ b/config/vuefilemanager.php @@ -1,7 +1,7 @@ '2.0.2', + 'version' => '2.0.3', 'is_demo' => env('APP_DEMO', false), diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 05ada352..f010fb35 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,75 +1,75 @@ { "/js/main.js": "/js/main.js", - "/chunks/request.js": "/chunks/request.js?id=37e3e34fbcc98d4c", - "/chunks/request-upload.js": "/chunks/request-upload.js?id=2a6d910114ffb8d2", - "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=3c2fc454c3fce8d2", - "/chunks/status-check.js": "/chunks/status-check.js?id=783c6143db13e6c0", - "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=c1df85c34d7e9521", - "/chunks/database.js": "/chunks/database.js?id=d4f38bfdef26b0d9", - "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=21e576c9c8183e42", - "/chunks/app-setup.js": "/chunks/app-setup.js?id=647bf9cdc907e83c", - "/chunks/admin-account.js": "/chunks/admin-account.js?id=d21b66f2b6e1638e", - "/chunks/shared.js": "/chunks/shared.js?id=52ff66b9c01f84ef", - "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=a9710655d75c8079", - "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=c013d98f7386c448", - "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=ca8cc89fe5982782", - "/chunks/not-found.js": "/chunks/not-found.js?id=4cb8d3a7a2212c3c", - "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=c71981d946a9ca71", - "/chunks/admin.js": "/chunks/admin.js?id=4c86279cd6e85aa5", - "/chunks/dashboard.js": "/chunks/dashboard.js?id=d8740b43db79abfe", - "/chunks/invoices.js": "/chunks/invoices.js?id=70fb9a603be2f554", - "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=94e96e1bb505ae59", - "/chunks/pages.js": "/chunks/pages.js?id=d1f5d211e9dfc4ae", - "/chunks/page-edit.js": "/chunks/page-edit.js?id=184547a95a64a121", - "/chunks/plans.js": "/chunks/plans.js?id=f6e9d2f34fac6d79", - "/chunks/users.js": "/chunks/users.js?id=651b8af7afecc88e", - "/chunks/user-create.js": "/chunks/user-create.js?id=d24c5037b91a2fa2", - "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=20a6ee217157864f", - "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=617982724a144a43", - "/chunks/user.js": "/chunks/user.js?id=dae4ac26750f99d0", - "/chunks/user-detail.js": "/chunks/user-detail.js?id=d56437755ba2c6cc", - "/chunks/user-storage.js": "/chunks/user-storage.js?id=c26b370f6f4323fe", - "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=6d7d1235d1ae5bf2", - "/chunks/user-password.js": "/chunks/user-password.js?id=acd9b49cca55d161", - "/chunks/user-delete.js": "/chunks/user-delete.js?id=47d44b2f8e4e620c", - "/chunks/plan.js": "/chunks/plan.js?id=d8ffa85dc9b68966", - "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=3010ddb4ba7419e9", - "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=d3c236e167831f25", - "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=44ad905bfe1ae983", - "/chunks/payments.js": "/chunks/payments.js?id=051e8246e2b5c9d0", - "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=7ec4ad9b9755b2b8", - "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=6644b642875c732f", - "/chunks/app-settings.js": "/chunks/app-settings.js?id=692d3291fb9d2cf7", - "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=27652021b725b9e7", - "/chunks/app-index.js": "/chunks/app-index.js?id=968d5378d871f070", - "/chunks/app-environment.js": "/chunks/app-environment.js?id=09a06687b64b4246", - "/chunks/app-others.js": "/chunks/app-others.js?id=2c024715a619858e", - "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=ea65b443a513ad8c", - "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=c4c4cda03202a49a", - "/chunks/app-server.js": "/chunks/app-server.js?id=307fce5c9d192bf3", - "/chunks/app-language.js": "/chunks/app-language.js?id=51c79c7bdb8f9382", - "/chunks/homepage.js": "/chunks/homepage.js?id=b45798483b942ac1", - "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=e110e8923b6ca22f", - "/chunks/contact-us.js": "/chunks/contact-us.js?id=54d3469e6d46cef6", - "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=3153532f0d2273c8", - "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=d630ed9f6f558509", - "/chunks/sign-in.js": "/chunks/sign-in.js?id=73e0fd17a1b1677d", - "/chunks/sign-up.js": "/chunks/sign-up.js?id=920ebe5b86e59c09", - "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=9c62b8573fbdd567", - "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=926b35b6745d99ba", - "/chunks/settings.js": "/chunks/settings.js?id=a1244ef9a4054cdf", - "/chunks/profile.js": "/chunks/profile.js?id=e92af0c70da9aa83", - "/chunks/settings-password.js": "/chunks/settings-password.js?id=080d3133ed6bc14c", - "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=736118b6409186cc", - "/chunks/billing.js": "/chunks/billing.js?id=e4e8b9c2f7fa6cd2", - "/chunks/platform.js": "/chunks/platform.js?id=dd458bc66dd8cb51", - "/chunks/files.js": "/chunks/files.js?id=5d6eb9b9f9ecd296", - "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=827d3a5dcce159b5", - "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=2a4e4e0db02cbcbb", - "/chunks/trash.js": "/chunks/trash.js?id=8362aa0f91231350", - "/chunks/team-folders.js": "/chunks/team-folders.js?id=0a46fecf35a23406", - "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=77a33583775c6d8f", - "/chunks/invitation.js": "/chunks/invitation.js?id=64a211c90b505767", + "/chunks/request.js": "/chunks/request.js?id=5b796b8410a96a49", + "/chunks/request-upload.js": "/chunks/request-upload.js?id=b1aaf8357a30794a", + "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec", + "/chunks/status-check.js": "/chunks/status-check.js?id=ca27b637120e086a", + "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=df5bd89528649783", + "/chunks/database.js": "/chunks/database.js?id=6bd9994bd24d6c8d", + "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=fc9b6215ce43229b", + "/chunks/app-setup.js": "/chunks/app-setup.js?id=77937d105dfa28ba", + "/chunks/admin-account.js": "/chunks/admin-account.js?id=6dbc3fe81f957a59", + "/chunks/shared.js": "/chunks/shared.js?id=96268e9b7e8e8a19", + "/chunks/shared/browser.js": "/chunks/shared/browser.js?id=3dc8fdb008b6ff5f", + "/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=9ccb8bb19b95a23f", + "/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=672e931a9fb0b672", + "/chunks/not-found.js": "/chunks/not-found.js?id=9f6ce23ce5d969f1", + "/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=f564565faa09d6d6", + "/chunks/admin.js": "/chunks/admin.js?id=5220642a9e4d30d4", + "/chunks/dashboard.js": "/chunks/dashboard.js?id=c7fa2f0dc8ed949c", + "/chunks/invoices.js": "/chunks/invoices.js?id=1416cbf6d1a593ac", + "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5bf6704f5b599f36", + "/chunks/pages.js": "/chunks/pages.js?id=c8380d571e91e8be", + "/chunks/page-edit.js": "/chunks/page-edit.js?id=b19868b3100360a3", + "/chunks/plans.js": "/chunks/plans.js?id=c8506e0e20966ef7", + "/chunks/users.js": "/chunks/users.js?id=ec687ee365c4248a", + "/chunks/user-create.js": "/chunks/user-create.js?id=bb3b30ce248209f0", + "/chunks/plan-create/fixed.js": "/chunks/plan-create/fixed.js?id=a8ffa08ce94ddf4e", + "/chunks/plan-create/metered.js": "/chunks/plan-create/metered.js?id=3b516dcccbbef20a", + "/chunks/user.js": "/chunks/user.js?id=c191b906a0496fe5", + "/chunks/user-detail.js": "/chunks/user-detail.js?id=80491654e6ee63b1", + "/chunks/user-storage.js": "/chunks/user-storage.js?id=69eb59b682c5482f", + "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=a69ebc3b23446cda", + "/chunks/user-password.js": "/chunks/user-password.js?id=e1c4ebc07ba426e6", + "/chunks/user-delete.js": "/chunks/user-delete.js?id=82b5180a1d9e1217", + "/chunks/plan.js": "/chunks/plan.js?id=4b267375ea9f19b3", + "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a956ceca6865c50c", + "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=f366690f8764bb20", + "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e26d5bd3ecbb4bb1", + "/chunks/payments.js": "/chunks/payments.js?id=dc4586691c25de6f", + "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=9942aaac1bdb11e5", + "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=717bf97ba2ffdc28", + "/chunks/app-settings.js": "/chunks/app-settings.js?id=55da23af2b076069", + "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=c308941663208358", + "/chunks/app-index.js": "/chunks/app-index.js?id=aa62aedf1f38cc22", + "/chunks/app-environment.js": "/chunks/app-environment.js?id=538eea914fc27794", + "/chunks/app-others.js": "/chunks/app-others.js?id=3282fb7a70e8e02e", + "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=3f8e5f906a4dee4e", + "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=4ee8de4ac0dae19e", + "/chunks/app-server.js": "/chunks/app-server.js?id=dd8c15d4646053cd", + "/chunks/app-language.js": "/chunks/app-language.js?id=ba087a47c8efca29", + "/chunks/homepage.js": "/chunks/homepage.js?id=f1cfba4f0152f4b9", + "/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=2504793131107b1f", + "/chunks/contact-us.js": "/chunks/contact-us.js?id=2e0b16655d2d85d7", + "/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=25b805ade5230382", + "/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=f4562229776d9f56", + "/chunks/sign-in.js": "/chunks/sign-in.js?id=295d214d04f2a86d", + "/chunks/sign-up.js": "/chunks/sign-up.js?id=77351b7631a6ee6c", + "/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=50a1bc5e4ed86ec9", + "/chunks/create-new-password.js": "/chunks/create-new-password.js?id=f652de052dba55c1", + "/chunks/settings.js": "/chunks/settings.js?id=29ed650209e64d66", + "/chunks/profile.js": "/chunks/profile.js?id=5b2ed82815320625", + "/chunks/settings-password.js": "/chunks/settings-password.js?id=c912a79595c2efcb", + "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=6fec7aac1a5280c7", + "/chunks/billing.js": "/chunks/billing.js?id=2a2cd66f503a9fc0", + "/chunks/platform.js": "/chunks/platform.js?id=86aefe46c825e07d", + "/chunks/files.js": "/chunks/files.js?id=060b1a34dfdbe97c", + "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=0f63bbc02ad8f3e1", + "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=0a06d32b4cf8b52c", + "/chunks/trash.js": "/chunks/trash.js?id=ac5389500f8f7912", + "/chunks/team-folders.js": "/chunks/team-folders.js?id=c0a03c6937856ca1", + "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=88fa008db0c6a4f6", + "/chunks/invitation.js": "/chunks/invitation.js?id=9ed8456c9d6d5ce1", "/css/tailwind.css": "/css/tailwind.css", "/css/app.css": "/css/app.css" } diff --git a/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php b/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php index f42ee101..7f3e381d 100644 --- a/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php +++ b/src/Domain/Files/Actions/MoveFileToExternalStorageAction.php @@ -23,19 +23,14 @@ class MoveFileToExternalStorageAction // If file is bigger than 5.2 MB then run multipart upload if ($filesize > 5242880) { - // Get driver - $driver = Storage::getDriver(); - - // Get adapter - $adapter = $driver->getAdapter(); // Get client - $client = $adapter->getClient(); + $client = Storage::disk('s3')->getClient(); // Prepare the upload parameters. // TODO: replace local files with temp folder $uploader = new MultipartUploader($client, config('filesystems.disks.local.root') . "/files/$user_id/$file", [ - 'bucket' => $adapter->getBucket(), + 'bucket' => config('filesystems.disks.s3.bucket'), 'key' => "files/$user_id/$file", ]);