mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-04-07 21:44:51 +00:00
3c31baf20d
Three bugs prevented backups stored on remote disks (Dropbox, S3, etc.) from ever appearing in the Settings > Backup listing: 1. Typo in BackupSetting.vue: `filed_disk_id` was sent to the API instead of `file_disk_id`, so the backend never received the selected disk ID and always fell back to the local filesystem. 2. Wrong default disk selection in loadDisksData(): `set_as_default == 0` selected the first disk that is NOT default (local_public), instead of the disk that IS default. Changed to `set_as_default == 1` with a fallback to the first disk. 3. BackupsController::index() did not call setConfig() on the FileDisk before querying backups, so even when the correct file_disk_id arrived it still read from the default local filesystem. Added the same disk bootstrap logic already present in CreateBackupJob and destroy(). Made-with: Cursor
108 lines
3.4 KiB
PHP
108 lines
3.4 KiB
PHP
<?php
|
|
|
|
// Implementation taken from nova-backup-tool - https://github.com/spatie/nova-backup-tool/
|
|
|
|
namespace App\Http\Controllers\V1\Admin\Backup;
|
|
|
|
use App\Jobs\CreateBackupJob;
|
|
use App\Rules\Backup\PathToZip;
|
|
use Illuminate\Http\JsonResponse;
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Support\Facades\Cache;
|
|
use Spatie\Backup\BackupDestination\Backup;
|
|
use Spatie\Backup\BackupDestination\BackupDestination;
|
|
use Spatie\Backup\Helpers\Format;
|
|
|
|
class BackupsController extends ApiController
|
|
{
|
|
/**
|
|
* Display a listing of the resource.
|
|
*
|
|
* @return JsonResponse
|
|
*/
|
|
public function index(Request $request)
|
|
{
|
|
$this->authorize('manage backups');
|
|
|
|
$configuredBackupDisks = config('backup.backup.destination.disks');
|
|
|
|
try {
|
|
if ($request->file_disk_id) {
|
|
$fileDisk = \App\Models\FileDisk::find($request->file_disk_id);
|
|
if ($fileDisk) {
|
|
$fileDisk->setConfig();
|
|
$prefix = env('DYNAMIC_DISK_PREFIX', 'temp_');
|
|
config(['backup.backup.destination.disks' => [$prefix.$fileDisk->driver]]);
|
|
$configuredBackupDisks = config('backup.backup.destination.disks');
|
|
}
|
|
}
|
|
|
|
$backupDestination = BackupDestination::create(config('filesystems.default'), config('backup.backup.name'));
|
|
|
|
$backups = Cache::remember("backups-{$request->file_disk_id}", now()->addSeconds(4), function () use ($backupDestination) {
|
|
return $backupDestination
|
|
->backups()
|
|
->map(function (Backup $backup) {
|
|
return [
|
|
'path' => $backup->path(),
|
|
'created_at' => $backup->date()->format('Y-m-d H:i:s'),
|
|
'size' => Format::humanReadableSize($backup->sizeInBytes()),
|
|
];
|
|
})
|
|
->toArray();
|
|
});
|
|
|
|
return response()->json([
|
|
'backups' => $backups,
|
|
'disks' => $configuredBackupDisks,
|
|
]);
|
|
} catch (\Exception $e) {
|
|
return response()->json([
|
|
'backups' => [],
|
|
'error' => 'invalid_disk_credentials',
|
|
'error_message' => $e->getMessage(),
|
|
'disks' => $configuredBackupDisks,
|
|
]);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Store a newly created resource in storage.
|
|
*
|
|
* @return JsonResponse
|
|
*/
|
|
public function store(Request $request)
|
|
{
|
|
$this->authorize('manage backups');
|
|
|
|
dispatch(new CreateBackupJob($request->all()))->onQueue(config('backup.queue.name'));
|
|
|
|
return $this->respondSuccess();
|
|
}
|
|
|
|
/**
|
|
* Remove the specified resource from storage.
|
|
*
|
|
* @return JsonResponse
|
|
*/
|
|
public function destroy($disk, Request $request)
|
|
{
|
|
$this->authorize('manage backups');
|
|
|
|
$validated = $request->validate([
|
|
'path' => ['required', new PathToZip],
|
|
]);
|
|
|
|
$backupDestination = BackupDestination::create(config('filesystems.default'), config('backup.backup.name'));
|
|
|
|
$backupDestination
|
|
->backups()
|
|
->first(function (Backup $backup) use ($validated) {
|
|
return $backup->path() === $validated['path'];
|
|
})
|
|
->delete();
|
|
|
|
return $this->respondSuccess();
|
|
}
|
|
}
|