From 4d306077bab4e001f2fd9db02aaebfbc8d21441b Mon Sep 17 00:00:00 2001 From: feliximafidon <36160264+feliximafidon@users.noreply.github.com> Date: Fri, 5 Mar 2021 23:43:19 +0100 Subject: [PATCH 1/3] Update FieldController.php --- src/FieldController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/FieldController.php b/src/FieldController.php index 63547e2..b5cf814 100755 --- a/src/FieldController.php +++ b/src/FieldController.php @@ -23,7 +23,7 @@ public function upload(Request $request) $data = [ 'originalName' => $request->file('file')->getClientOriginalName(), 'name' => $file, - 'url' => Storage::url($file), + 'url' => Storage::disk($disk)->url($file), ]; return $data; @@ -31,7 +31,8 @@ public function upload(Request $request) public function delete($file) { - Storage::delete($file); + $disk = $request->disk ? $request->disk : 'public'; + Storage::disk($disk)->delete($file); return "success"; } From c237c4f2a86f59de033ce614e151a059a331906e Mon Sep 17 00:00:00 2001 From: feliximafidon <36160264+feliximafidon@users.noreply.github.com> Date: Fri, 5 Mar 2021 23:58:47 +0100 Subject: [PATCH 2/3] Update FieldController.php --- src/FieldController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/FieldController.php b/src/FieldController.php index b5cf814..91ca465 100755 --- a/src/FieldController.php +++ b/src/FieldController.php @@ -19,11 +19,14 @@ public function upload(Request $request) $path = $request->path ? $request->path : '/'; $file = Storage::disk($disk)->putFile($path, $request->file('file')); + $url = config('filesystems.disks.' . $disk . '.driver') == 's3' ? + Storage::disk($disk)->temporaryUrl($file, now()->addMinutes(30)) : + Storage::disk($disk)->url($file); $data = [ 'originalName' => $request->file('file')->getClientOriginalName(), 'name' => $file, - 'url' => Storage::disk($disk)->url($file), + 'url' => $url, ]; return $data; @@ -31,8 +34,7 @@ public function upload(Request $request) public function delete($file) { - $disk = $request->disk ? $request->disk : 'public'; - Storage::disk($disk)->delete($file); + Storage::delete($file); return "success"; } From 3f2b4c5a0a2bb2348eaaa85e644b371fae35a40d Mon Sep 17 00:00:00 2001 From: feliximafidon <36160264+feliximafidon@users.noreply.github.com> Date: Sat, 6 Mar 2021 00:02:47 +0100 Subject: [PATCH 3/3] Update api.php --- routes/api.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/api.php b/routes/api.php index c5f284c..af61a05 100755 --- a/routes/api.php +++ b/routes/api.php @@ -3,4 +3,4 @@ Route::get('/', 'Halimtuhu\ArrayFiles\FieldController@index'); Route::post('/upload', 'Halimtuhu\ArrayFiles\FieldController@upload'); -Route::delete('/delete/{image}', 'Halimtuhu\ArrayFiles\FieldController@delete'); \ No newline at end of file +Route::delete('/delete/{image}', 'Halimtuhu\ArrayFiles\FieldController@delete')->where('image', '.*');