← All changes | app/Services/FileSystem/DownloadService.php +4 -6 1.6.2 → 1.6.5 View file →

		@@ -49,10 +49,9 @@
49	49	private function downloadFile($params)
50	50	{
51	51	$driver = Arr::get($params, 'driver');
52	52	$file = Arr::get($params, 'file');
53		- $productDownload = ProductDownloadResource::find(Arr::get($params, 'download_id'));
54		- $bucket = Arr::get($productDownload, 'settings.bucket', '');
	53	+ $bucket = StorageBucketResolver::resolveOrNull($driver);
55	54	(new FileManager($driver))->downloadFile($file,$file, $bucket);
56	55	}
57	56
58	57	public static function downloadFileFromId($downloadId)
		@@ -62,9 +61,9 @@
62	61	return __('File not found', 'fluent-cart');
63	62	}
64	63	$driver = Arr::get($productDownload, 'driver');
65	64	$file = Arr::get($productDownload, 'file_path');
66		- $bucket = Arr::get($productDownload, 'settings.bucket', '');
	65	+ $bucket = StorageBucketResolver::resolveOrNull($driver);
67	66	$downloadName = Arr::get($productDownload, 'file_name');
68	67
69	68	try{
70	69	$fileManager = new FileManager($driver);
		@@ -78,9 +77,9 @@
78	77	{
79	78	$driver = Arr::get($productDownload, 'driver');
80	79	$file = Arr::get($productDownload, 'file_path');
81	80	$fileName = Arr::get($productDownload, 'file_name');
82		- $bucket = Arr::get($productDownload, 'settings.bucket', '');
	81	+ $bucket = StorageBucketResolver::resolveOrNull($driver);
83	82	return (new FileManager($driver))->getSignedDownloadUrl($file, $bucket, $productDownload);
84	83	}
85	84
86	85	public function getDownloadableUrl($params): string
		@@ -100,10 +99,9 @@
100	99	public function getDownloadablePath($params)
101	100	{
102	101	$driver = Arr::get($params, 'driver');
103	102	$file = Arr::get($params, 'file');
104		- $productDownload = ProductDownloadResource::find(Arr::get($params, 'download_id'));
105		- $bucket = Arr::get($productDownload, 'settings.bucket', '');
	103	+ $bucket = StorageBucketResolver::resolveOrNull($driver);
106	104	return (new FileManager($driver))->getFilePath($file, $bucket);
107	105	}
108	106
109	107	}