added it_zip_shared_multiple_files_and_download_it, it_try_zip_non_shared_file_with_shared_multiple_files_and_download_it test

This commit is contained in:
Peter Papp
2021-03-10 10:02:44 +01:00
parent 1045423692
commit 8d85aad601
5 changed files with 135 additions and 15 deletions
+22 -11
View File
@@ -92,11 +92,17 @@ class FileAccessController extends Controller
*/
public function get_zip($id)
{
$disk = Storage::disk('local');
$zip = Zip::whereId($id)
->where('user_id', Auth::id())
->firstOrFail();
$disk = Storage::disk('local');
$zip
->user
->record_download(
$disk->size("zip/$zip->basename")
);
return $disk->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
@@ -116,21 +122,26 @@ class FileAccessController extends Controller
*/
public function get_zip_public($id, $token)
{
$disk = Storage::disk('local');
$zip = Zip::where('id', $id)
->where('shared_token', $token)
->first();
$zip_path = 'zip/' . $zip->basename;
$zip
->user
->record_download(
$disk->size("zip/$zip->basename")
);
$header = [
"Content-Type" => 'application/zip',
"Content-Length" => Storage::disk('local')->size($zip_path),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . Storage::disk('local')->size($zip_path),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
];
return Storage::disk('local')->download($zip_path, $zip->basename, $header);
return $disk
->download("zip/$zip->basename", $zip->basename, [
"Content-Type" => 'application/zip',
"Content-Length" => $disk->size("zip/$zip->basename"),
"Accept-Ranges" => "bytes",
"Content-Range" => "bytes 0-600/" . $disk->size("zip/$zip->basename"),
"Content-Disposition" => "attachment; filename=" . $zip->basename,
]);
}
/**
@@ -459,7 +459,7 @@ class EditItemsController extends Controller
$shared = get_shared($token);
$file_parent_folders = File::whereUserId($shared->user_id)
->whereIn('id', $request->input('files'))
->whereIn('id', $request->items)
->get()
->pluck('folder_id')
->toArray();
@@ -469,7 +469,7 @@ class EditItemsController extends Controller
// Get requested files
$files = File::whereUserId($shared->user_id)
->whereIn('id', $request->input('files'))
->whereIn('id', $request->items)
->get();
$zip = Editor::zip_files($files, $shared);
@@ -481,7 +481,7 @@ class EditItemsController extends Controller
'token' => $shared->token,
]),
'name' => $zip->basename,
], 200);
], 201);
}
/**
+1 -1
View File
@@ -3,7 +3,7 @@
namespace App\Http\Tools;
use App;
use App\Folder;
use App\Models\Folder;
use Illuminate\Support\Arr;
+5
View File
@@ -16,6 +16,11 @@ class Zip extends Model
protected $keyType = 'string';
public function user()
{
return $this->hasOne(User::class, 'id', 'user_id');
}
/**
* Model events
*/
+104
View File
@@ -3,9 +3,11 @@
namespace Tests\Feature;
use App\Models\File;
use App\Models\Folder;
use App\Models\Share;
use App\Models\Traffic;
use App\Models\User;
use App\Models\Zip;
use App\Services\SetupService;
use Carbon\Carbon;
use Illuminate\Foundation\Testing\DatabaseMigrations;
@@ -132,4 +134,106 @@ class ShareContentAccessTest extends TestCase
$this->get("/api/files/$share->token/public")
->assertStatus(403);
}
/**
* @test
*/
public function it_zip_shared_multiple_files_and_download_it()
{
Storage::fake('local');
$this->setup->create_directories();
$user = User::factory(User::class)
->create();
$folder = Folder::factory(Folder::class)
->create([
'user_id' => $user->id
]);
collect([0, 1])
->each(function ($index) use ($folder, $user) {
$file = UploadedFile::fake()
->create(Str::random() . "-fake-file-$index.pdf", 1000, 'application/pdf');
Storage::putFileAs("files/$user->id", $file, $file->name);
File::factory(File::class)
->create([
'filesize' => $file->getSize(),
'folder_id' => $folder->id,
'user_id' => $user->id,
'basename' => $file->name,
'name' => "fake-file-$index.pdf",
]);
});
$share = Share::factory(Share::class)
->create([
'item_id' => $folder->id,
'user_id' => $user->id,
'type' => 'folder',
'is_protected' => false,
]);
$this->postJson("/api/zip/public/$share->token", [
'items' => File::all()->pluck('id')
])->assertStatus(201);
$this->assertDatabaseHas('zips', [
'user_id' => $user->id,
'shared_token' => $share->token,
]);
$zip = Zip::first();
Storage::assertExists("zip/$zip->basename");
$this->get("/zip/$zip->id/public/$share->token")
->assertStatus(200);
$this->assertDatabaseMissing('traffic', [
'user_id' => $user->id,
'download' => null,
]);
}
/**
* @test
*/
public function it_try_zip_non_shared_file_with_shared_multiple_files_and_download_it()
{
$user = User::factory(User::class)
->create();
$folder = Folder::factory(Folder::class)
->create([
'user_id' => $user->id
]);
File::factory(File::class)
->create([
'folder_id' => $folder->id,
'user_id' => $user->id,
]);
File::factory(File::class)
->create([
'user_id' => $user->id,
]);
$share = Share::factory(Share::class)
->create([
'item_id' => $folder->id,
'user_id' => $user->id,
'type' => 'folder',
'is_protected' => false,
]);
$this->postJson("/api/zip/public/$share->token", [
'items' => File::all()->pluck('id')
])->assertStatus(403);
}
}