From 69eb8dacce04e8920a8e132d9f4ba0b69cba3153 Mon Sep 17 00:00:00 2001 From: Peter Papp Date: Thu, 22 Jul 2021 12:39:32 +0200 Subject: [PATCH] share delete fix --- public/mix-manifest.json | 5 +++-- resources/js/components/Others/ShareEditPopup.vue | 2 +- src/Domain/Sharing/Controllers/ShareController.php | 7 +++---- tests/Domain/Sharing/UserShareTest.php | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 24e5fa03..67289b4f 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -55,7 +55,7 @@ "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=dbc08f8cdc23900ef40a", "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8c4b655b9286e06894c5", "/chunks/plans.js": "/chunks/plans.js?id=2b26173a02ed9f86e875", - "/chunks/platform.js": "/chunks/platform.js?id=b7b13093369e09fcb1cb", + "/chunks/platform.js": "/chunks/platform.js?id=96e35689e3b71e7097eb", "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=be3d7cf51585313cf53b", "/chunks/profile.js": "/chunks/profile.js?id=03526296e71df827ff47", "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=fd25990d1ccec0294602", @@ -97,5 +97,6 @@ "/chunks/sign-in.e4bd63dd478b0b7f9731.hot-update.js": "/chunks/sign-in.e4bd63dd478b0b7f9731.hot-update.js", "/chunks/sign-in.5fb05f1c4d2f285ebf61.hot-update.js": "/chunks/sign-in.5fb05f1c4d2f285ebf61.hot-update.js", "/chunks/sign-in.64892e5fdc888eba9b23.hot-update.js": "/chunks/sign-in.64892e5fdc888eba9b23.hot-update.js", - "/chunks/sign-in.62aa097b63d9b34e26cd.hot-update.js": "/chunks/sign-in.62aa097b63d9b34e26cd.hot-update.js" + "/chunks/sign-in.62aa097b63d9b34e26cd.hot-update.js": "/chunks/sign-in.62aa097b63d9b34e26cd.hot-update.js", + "/chunks/platform.cc7392304bf1bf06dc6c.hot-update.js": "/chunks/platform.cc7392304bf1bf06dc6c.hot-update.js" } diff --git a/resources/js/components/Others/ShareEditPopup.vue b/resources/js/components/Others/ShareEditPopup.vue index 43179891..d95ba473 100644 --- a/resources/js/components/Others/ShareEditPopup.vue +++ b/resources/js/components/Others/ShareEditPopup.vue @@ -240,7 +240,7 @@ // Send delete request await this.$store.dispatch('shareCancel' , this.pickedItem) - .then((response) => { + .then(() => { // End deleting spinner button setTimeout(() => this.isDeleting = false, 150) diff --git a/src/Domain/Sharing/Controllers/ShareController.php b/src/Domain/Sharing/Controllers/ShareController.php index 529155ea..005a7f5d 100644 --- a/src/Domain/Sharing/Controllers/ShareController.php +++ b/src/Domain/Sharing/Controllers/ShareController.php @@ -76,10 +76,9 @@ class ShareController extends Controller /** * Delete sharing item */ - public function destroy( - Request $request, - ): Response { - foreach ($request->input('tokens') as $token) { + public function destroy(): Response + { + foreach (request()->input('tokens') as $token) { // Delete share record Share::where('token', $token) ->where('user_id', Auth::id()) diff --git a/tests/Domain/Sharing/UserShareTest.php b/tests/Domain/Sharing/UserShareTest.php index 0e76d97d..34a0682c 100644 --- a/tests/Domain/Sharing/UserShareTest.php +++ b/tests/Domain/Sharing/UserShareTest.php @@ -222,7 +222,7 @@ class UserShareTest extends TestCase 'id' => $folder->id, ])->assertStatus(201); - $this->deleteJson('/api/share', [ + $this->deleteJson('/api/share/revoke', [ 'tokens' => [ $folder->shared->token, ],