mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-18 08:12:15 +00:00
Fix backend code styling
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use Domain\Zip\Controllers\ZipController;
|
||||||
use App\Users\Actions\CreateNewUserAction;
|
use App\Users\Actions\CreateNewUserAction;
|
||||||
use Domain\Pages\Controllers\PagesController;
|
use Domain\Pages\Controllers\PagesController;
|
||||||
use Domain\Zip\Controllers\ZipController;
|
|
||||||
use Domain\Sharing\Controllers\ShareController;
|
use Domain\Sharing\Controllers\ShareController;
|
||||||
use Domain\Trash\Controllers\DumpTrashController;
|
use Domain\Trash\Controllers\DumpTrashController;
|
||||||
use App\Users\Controllers\ResetPasswordController;
|
use App\Users\Controllers\ResetPasswordController;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Console;
|
namespace App\Console;
|
||||||
|
|
||||||
use Illuminate\Console\Scheduling\Schedule;
|
use Illuminate\Console\Scheduling\Schedule;
|
||||||
@@ -27,18 +26,18 @@ class Kernel extends ConsoleKernel
|
|||||||
*/
|
*/
|
||||||
protected function schedule(Schedule $schedule): void
|
protected function schedule(Schedule $schedule): void
|
||||||
{
|
{
|
||||||
if (!is_storage_driver(['local'])) {
|
if (! is_storage_driver(['local'])) {
|
||||||
$schedule->call(
|
$schedule->call(
|
||||||
fn() => resolve(DeleteFailedFilesAction::class)()
|
fn () => resolve(DeleteFailedFilesAction::class)()
|
||||||
)->everySixHours();
|
)->everySixHours();
|
||||||
}
|
}
|
||||||
|
|
||||||
$schedule->call(
|
$schedule->call(
|
||||||
fn() => resolve(DeleteExpiredShareLinksAction::class)()
|
fn () => resolve(DeleteExpiredShareLinksAction::class)()
|
||||||
)->everyTenMinutes();
|
)->everyTenMinutes();
|
||||||
|
|
||||||
$schedule->call(
|
$schedule->call(
|
||||||
fn() => resolve(DeleteUnverifiedUsersAction::class)()
|
fn () => resolve(DeleteUnverifiedUsersAction::class)()
|
||||||
)->daily();
|
)->daily();
|
||||||
|
|
||||||
// Run queue jobs every minute
|
// Run queue jobs every minute
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ class ProtectShareRecordAction
|
|||||||
Share $shared
|
Share $shared
|
||||||
): void {
|
): void {
|
||||||
if ($shared->is_protected) {
|
if ($shared->is_protected) {
|
||||||
|
|
||||||
if (! request()->hasCookie('share_session')) {
|
if (! request()->hasCookie('share_session')) {
|
||||||
abort(403, $this->message);
|
abort(403, $this->message);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Domain\Sharing\Controllers;
|
namespace Domain\Sharing\Controllers;
|
||||||
|
|
||||||
use Domain\Zip\Models\Zip;
|
|
||||||
use Illuminate\Http\Response;
|
use Illuminate\Http\Response;
|
||||||
use Domain\Sharing\Models\Share;
|
use Domain\Sharing\Models\Share;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Domain\Zip\Actions;
|
namespace Domain\Zip\Actions;
|
||||||
|
|
||||||
|
|
||||||
use Domain\Files\Models\File;
|
use Domain\Files\Models\File;
|
||||||
use Domain\Folders\Models\Folder;
|
use Domain\Folders\Models\Folder;
|
||||||
|
|
||||||
@@ -42,4 +39,4 @@ class GetItemsListFromUrlParamAction
|
|||||||
|
|
||||||
return [$folders, $files];
|
return [$folders, $files];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,17 +1,14 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Domain\Zip\Actions;
|
namespace Domain\Zip\Actions;
|
||||||
|
|
||||||
|
use ZipStream\ZipStream;
|
||||||
use Domain\Folders\Models\Folder;
|
use Illuminate\Support\Str;
|
||||||
use Domain\Sharing\Models\Share;
|
use Domain\Sharing\Models\Share;
|
||||||
|
use Domain\Folders\Models\Folder;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use STS\ZipStream\ZipStreamFacade as Zip;
|
use STS\ZipStream\ZipStreamFacade as Zip;
|
||||||
use ZipStream\ZipStream;
|
|
||||||
|
|
||||||
class ZipAction
|
class ZipAction
|
||||||
{
|
{
|
||||||
@@ -20,7 +17,6 @@ class ZipAction
|
|||||||
Collection $files,
|
Collection $files,
|
||||||
?Share $shared = null
|
?Share $shared = null
|
||||||
): ZipStream {
|
): ZipStream {
|
||||||
|
|
||||||
// Get user id
|
// Get user id
|
||||||
$user_id = Auth::id() ?? $shared->user_id;
|
$user_id = Auth::id() ?? $shared->user_id;
|
||||||
|
|
||||||
@@ -89,4 +85,4 @@ class ZipAction
|
|||||||
|
|
||||||
return $zip;
|
return $zip;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Domain\Zip\Controllers;
|
namespace Domain\Zip\Controllers;
|
||||||
|
|
||||||
|
use ZipStream\ZipStream;
|
||||||
use App\Http\Controllers\Controller;
|
use Illuminate\Http\Request;
|
||||||
use Domain\Files\Models\File;
|
use Domain\Files\Models\File;
|
||||||
|
use Domain\Sharing\Models\Share;
|
||||||
|
use Domain\Zip\Actions\ZipAction;
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use Domain\Traffic\Actions\RecordDownloadAction;
|
||||||
use Domain\Sharing\Actions\ProtectShareRecordAction;
|
use Domain\Sharing\Actions\ProtectShareRecordAction;
|
||||||
use Domain\Sharing\Actions\VerifyAccessToItemAction;
|
use Domain\Sharing\Actions\VerifyAccessToItemAction;
|
||||||
use Domain\Sharing\Models\Share;
|
|
||||||
use Domain\Traffic\Actions\RecordDownloadAction;
|
|
||||||
use Domain\Zip\Actions\GetItemsListFromUrlParamAction;
|
use Domain\Zip\Actions\GetItemsListFromUrlParamAction;
|
||||||
use Domain\Zip\Actions\ZipAction;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use ZipStream\ZipStream;
|
|
||||||
|
|
||||||
class VisitorZipController extends Controller
|
class VisitorZipController extends Controller
|
||||||
{
|
{
|
||||||
@@ -23,13 +20,13 @@ class VisitorZipController extends Controller
|
|||||||
public VerifyAccessToItemAction $verifyAccessToItem,
|
public VerifyAccessToItemAction $verifyAccessToItem,
|
||||||
public RecordDownloadAction $recordDownload,
|
public RecordDownloadAction $recordDownload,
|
||||||
public ZipAction $zip,
|
public ZipAction $zip,
|
||||||
) {}
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
public function __invoke(
|
public function __invoke(
|
||||||
Request $request,
|
Request $request,
|
||||||
Share $shared,
|
Share $shared,
|
||||||
): ZipStream {
|
): ZipStream {
|
||||||
|
|
||||||
// Check ability to access protected share record
|
// Check ability to access protected share record
|
||||||
($this->protectShareRecord)($shared);
|
($this->protectShareRecord)($shared);
|
||||||
|
|
||||||
@@ -44,7 +41,6 @@ class VisitorZipController extends Controller
|
|||||||
|
|
||||||
// Check access to requested files
|
// Check access to requested files
|
||||||
if ($files->isNotEmpty()) {
|
if ($files->isNotEmpty()) {
|
||||||
|
|
||||||
$file_parent_folders = File::whereUserId($shared->user_id)
|
$file_parent_folders = File::whereUserId($shared->user_id)
|
||||||
->whereIn('id', $files->pluck('id'))
|
->whereIn('id', $files->pluck('id'))
|
||||||
->get()
|
->get()
|
||||||
@@ -65,4 +61,4 @@ class VisitorZipController extends Controller
|
|||||||
|
|
||||||
return $zip;
|
return $zip;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
|
||||||
namespace Domain\Zip\Controllers;
|
namespace Domain\Zip\Controllers;
|
||||||
|
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
use STS\ZipStream\ZipStream;
|
||||||
|
use Domain\Zip\Actions\ZipAction;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Domain\Traffic\Actions\RecordDownloadAction;
|
use Domain\Traffic\Actions\RecordDownloadAction;
|
||||||
use Domain\Zip\Actions\GetItemsListFromUrlParamAction;
|
use Domain\Zip\Actions\GetItemsListFromUrlParamAction;
|
||||||
use Domain\Zip\Actions\ZipAction;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Auth;
|
|
||||||
use STS\ZipStream\ZipStream;
|
|
||||||
|
|
||||||
class ZipController extends Controller
|
class ZipController extends Controller
|
||||||
{
|
{
|
||||||
@@ -18,7 +15,8 @@ class ZipController extends Controller
|
|||||||
public ZipAction $zip,
|
public ZipAction $zip,
|
||||||
public RecordDownloadAction $recordDownload,
|
public RecordDownloadAction $recordDownload,
|
||||||
public GetItemsListFromUrlParamAction $getItemsListFromUrlParam,
|
public GetItemsListFromUrlParamAction $getItemsListFromUrlParam,
|
||||||
) {}
|
) {
|
||||||
|
}
|
||||||
|
|
||||||
public function __invoke(
|
public function __invoke(
|
||||||
Request $request,
|
Request $request,
|
||||||
@@ -38,4 +36,4 @@ class ZipController extends Controller
|
|||||||
|
|
||||||
return $zip;
|
return $zip;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ use Storage;
|
|||||||
use Notification;
|
use Notification;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
use App\Users\Models\User;
|
use App\Users\Models\User;
|
||||||
use Domain\Zip\Models\Zip;
|
|
||||||
use Laravel\Sanctum\Sanctum;
|
use Laravel\Sanctum\Sanctum;
|
||||||
use Domain\Files\Models\File;
|
use Domain\Files\Models\File;
|
||||||
use Domain\Sharing\Models\Share;
|
use Domain\Sharing\Models\Share;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ namespace Tests\Domain\Files;
|
|||||||
use Storage;
|
use Storage;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
use App\Users\Models\User;
|
use App\Users\Models\User;
|
||||||
use Domain\Zip\Models\Zip;
|
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Laravel\Sanctum\Sanctum;
|
use Laravel\Sanctum\Sanctum;
|
||||||
use Domain\Files\Models\File;
|
use Domain\Files\Models\File;
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ namespace Tests\Domain\Sharing;
|
|||||||
use Storage;
|
use Storage;
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
use App\Users\Models\User;
|
use App\Users\Models\User;
|
||||||
use Domain\Zip\Models\Zip;
|
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Domain\Files\Models\File;
|
use Domain\Files\Models\File;
|
||||||
use Domain\Sharing\Models\Share;
|
use Domain\Sharing\Models\Share;
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Tests\Domain\Zip;
|
namespace Tests\Domain\Zip;
|
||||||
|
|
||||||
use Storage;
|
use Storage;
|
||||||
@@ -96,7 +95,7 @@ class SharedZippingTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check public shared item
|
// Check public shared item
|
||||||
if (!$is_protected) {
|
if (! $is_protected) {
|
||||||
$this
|
$this
|
||||||
->get("/api/zip/{$share->token}?items=$files[0]|file,$files[1]|file,$folder->id|folder")
|
->get("/api/zip/{$share->token}?items=$files[0]|file,$files[1]|file,$folder->id|folder")
|
||||||
->assertStatus(200)
|
->assertStatus(200)
|
||||||
@@ -158,7 +157,7 @@ class SharedZippingTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check public shared item
|
// Check public shared item
|
||||||
if (!$is_protected) {
|
if (! $is_protected) {
|
||||||
$this
|
$this
|
||||||
->get("/api/zip/$share->token?items=$files[0]|file,$files[1]|file")
|
->get("/api/zip/$share->token?items=$files[0]|file,$files[1]|file")
|
||||||
->assertStatus(403);
|
->assertStatus(403);
|
||||||
@@ -229,7 +228,7 @@ class SharedZippingTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check public shared item
|
// Check public shared item
|
||||||
if (!$is_protected) {
|
if (! $is_protected) {
|
||||||
$this->getJson("/api/zip/$share->token?items=$children->id|folder")
|
$this->getJson("/api/zip/$share->token?items=$children->id|folder")
|
||||||
->assertStatus(200);
|
->assertStatus(200);
|
||||||
}
|
}
|
||||||
@@ -273,7 +272,7 @@ class SharedZippingTest extends TestCase
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check public shared item
|
// Check public shared item
|
||||||
if (!$is_protected) {
|
if (! $is_protected) {
|
||||||
$this->getJson("/api/zip/$share->token?items=$folder->id|folder")
|
$this->getJson("/api/zip/$share->token?items=$folder->id|folder")
|
||||||
->assertStatus(403);
|
->assertStatus(403);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace Tests\Domain\Zip;
|
namespace Tests\Domain\Zip;
|
||||||
|
|
||||||
use Storage;
|
|
||||||
use Tests\TestCase;
|
use Tests\TestCase;
|
||||||
use App\Users\Models\User;
|
use App\Users\Models\User;
|
||||||
use Laravel\Sanctum\Sanctum;
|
use Laravel\Sanctum\Sanctum;
|
||||||
|
|||||||
Reference in New Issue
Block a user