nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-27 18:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

api refactoring

Browse Source
This commit is contained in:
Čarodej
2022-05-11 09:19:55 +02:00
parent d2371e667f
commit 70901a2df5
59 changed files with 861 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Domain/Files/Actions/GetFileParentId.php
+3 -2
View File
@@ -3,11 +3,12 @@ namespace Domain\Files\Actions;
use Domain\Folders\Models\Folder;
use Illuminate\Support\Collection;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Requests\UploadFileRequest;
use Domain\Files\Requests\UploadChunkRequest;
class GetFileParentId
{
public function __invoke(UploadRequest $request, string $userId): ?string
public function __invoke(UploadChunkRequest|UploadFileRequest $request, string $userId): ?string
{
// extract file path
$directoryPath = collect(
src/Domain/Files/Actions/ProcessFileAction.php
+4 -3
View File
@@ -4,7 +4,8 @@ namespace Domain\Files\Actions;
use App\Users\Models\User;
use Domain\Files\Models\File;
use Illuminate\Support\Facades\Storage;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Requests\UploadFileRequest;
use Domain\Files\Requests\UploadChunkRequest;
use Domain\Traffic\Actions\RecordUploadAction;
use League\Flysystem\UnableToRetrieveMetadata;
@@ -24,7 +25,7 @@ class ProcessFileAction
* Upload new file
*/
public function __invoke(
UploadRequest $request,
UploadChunkRequest|UploadFileRequest $request,
User $user,
string $name,
): File {
@@ -50,7 +51,7 @@ class ProcessFileAction
}
// File size handling
if ($uploadLimit && $size > format_bytes($uploadLimit)) {
if ($uploadLimit && $size > toBytes($uploadLimit)) {
abort(413);
}
src/Domain/Files/Actions/StoreFileChunksAction.php
+4 -4
View File
@@ -3,7 +3,7 @@ namespace Domain\Files\Actions;
use Illuminate\Support\Facades\File;
use Illuminate\Support\Facades\Storage;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Requests\UploadChunkRequest;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
class StoreFileChunksAction
@@ -11,10 +11,10 @@ class StoreFileChunksAction
/**
* @throws FileNotFoundException
*/
public function __invoke(UploadRequest $request)
public function __invoke(UploadChunkRequest $request)
{
// Get uploaded file
$file = $request->file('file');
$file = $request->file('chunk');
// Get chunk name
$name = $file->getClientOriginalName();
@@ -26,7 +26,7 @@ class StoreFileChunksAction
File::append($path, $file->get());
// If last chunk, then return file path
if ($request->boolean('is_last')) {
if ($request->boolean('is_last_chunk')) {
return "chunks/$name";
}
}
src/Domain/Files/Controllers/UploadFileChunksController.php
+59
View File
@@ -0,0 +1,59 @@
<?php
namespace Domain\Files\Controllers;
use Storage;
use Illuminate\Support\Str;
use Domain\Folders\Models\Folder;
use App\Http\Controllers\Controller;
use Domain\Files\Resources\FileResource;
use Domain\Files\Actions\ProcessFileAction;
use Domain\Files\Requests\UploadChunkRequest;
use Support\Demo\Actions\FakeUploadFileAction;
use Domain\Files\Actions\StoreFileChunksAction;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
class UploadFileChunksController extends Controller
{
public function __construct(
public ProcessFileAction $processFie,
public FakeUploadFileAction $fakeUploadFile,
public StoreFileChunksAction $storeFileChunks,
) {
}
/**
* Upload file for authenticated master|editor user
*
* @throws FileNotFoundException
*/
public function __invoke(UploadChunkRequest $request)
{
if (isDemoAccount()) {
return ($this->fakeUploadFile)($request);
}
// Store file chunks
$chunkPath = ($this->storeFileChunks)($request);
// Proceed after last chunk
if ($request->boolean('is_last_chunk')) {
// Get user
$user = $request->filled('parent_id')
? Folder::find($request->input('parent_id'))
->getLatestParent()
->user
: auth()->user();
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
// Move file to user directory
Storage::disk('local')->move($chunkPath, "files/$user->id/$name");
// Process file
$file = ($this->processFie)($request, $user, $name);
return response(new FileResource($file), 201);
}
}
}
src/Domain/Files/Controllers/UploadFileController.php
+17 -30
View File
@@ -4,56 +4,43 @@ namespace Domain\Files\Controllers;
use Storage;
use Illuminate\Support\Str;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Resources\FileResource;
use Domain\Files\Actions\ProcessFileAction;
use Domain\Files\Requests\UploadFileRequest;
use Support\Demo\Actions\FakeUploadFileAction;
use Domain\Files\Actions\StoreFileChunksAction;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
class UploadFileController extends Controller
{
public function __construct(
public ProcessFileAction $processFie,
public FakeUploadFileAction $fakeUploadFile,
public StoreFileChunksAction $storeFileChunks,
) {
}
/**
* Upload file for authenticated master|editor user
*
* @throws FileNotFoundException
*/
public function __invoke(UploadRequest $request)
public function __invoke(UploadFileRequest $request): JsonResponse
{
if (isDemoAccount()) {
return ($this->fakeUploadFile)($request);
return response()->json(($this->fakeUploadFile)($request), 201);
}
// Store file chunks
$chunkPath = ($this->storeFileChunks)($request);
// Get user
$user = $request->filled('parent_id')
? Folder::find($request->input('parent_id'))
->getLatestParent()
->user
: auth()->user();
// Proceed after last chunk
if ($request->boolean('is_last')) {
// Get user
$user = $request->filled('parent_id')
? Folder::find($request->input('parent_id'))
->getLatestParent()
->user
: auth()->user();
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
// Put file to user directory
Storage::disk('local')->put("files/$user->id/$name", $request->file('file')->get());
// Move file to user directory
Storage::disk('local')->move($chunkPath, "files/$user->id/$name");
// Process file
$file = ($this->processFie)($request, $user, $name);
// Process file
$file = ($this->processFie)($request, $user, $name);
return response(new FileResource($file), 201);
}
return response()->json(new FileResource($file), 201);
}
}
src/Domain/Files/Controllers/VisitorUploadFileController.php → src/Domain/Files/Controllers/VisitorUploadFileChunksController.php
+4 -4
View File
@@ -5,9 +5,9 @@ use Str;
use Storage;
use Domain\Sharing\Models\Share;
use App\Http\Controllers\Controller;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Resources\FileResource;
use Domain\Files\Actions\ProcessFileAction;
use Domain\Files\Requests\UploadChunkRequest;
use Support\Demo\Actions\FakeUploadFileAction;
use Domain\Files\Actions\StoreFileChunksAction;
use Domain\Sharing\Actions\ProtectShareRecordAction;
@@ -17,7 +17,7 @@ use Illuminate\Contracts\Filesystem\FileNotFoundException;
/**
* guest user upload file into shared folder
*/
class VisitorUploadFileController extends Controller
class VisitorUploadFileChunksController extends Controller
{
public function __construct(
public ProcessFileAction $processFie,
@@ -32,7 +32,7 @@ class VisitorUploadFileController extends Controller
* @throws FileNotFoundException
*/
public function __invoke(
UploadRequest $request,
UploadChunkRequest $request,
Share $shared,
) {
if (isDemoAccount()) {
@@ -54,7 +54,7 @@ class VisitorUploadFileController extends Controller
$chunkPath = ($this->storeFileChunks)($request);
// Proceed after last chunk
if ($request->boolean('is_last')) {
if ($request->boolean('is_last_chunk')) {
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
src/Domain/Files/Requests/UploadChunkRequest.php
+35
View File
@@ -0,0 +1,35 @@
<?php
namespace Domain\Files\Requests;
use Domain\Admin\Rules\DisabledMimetypes;
use Illuminate\Foundation\Http\FormRequest;
class UploadChunkRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => 'required|string',
'parent_id' => 'sometimes|uuid',
'path' => 'sometimes|string',
'is_last_chunk' => 'required|boolean',
'extension' => 'required|string|nullable',
'chunk' => ['required', 'file', new DisabledMimetypes],
];
}
}
src/Domain/Files/Requests/UploadRequest.php → src/Domain/Files/Requests/UploadFileRequest.php
+6 -7
View File
@@ -4,7 +4,7 @@ namespace Domain\Files\Requests;
use Domain\Admin\Rules\DisabledMimetypes;
use Illuminate\Foundation\Http\FormRequest;
class UploadRequest extends FormRequest
class UploadFileRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
@@ -24,12 +24,11 @@ class UploadRequest extends FormRequest
public function rules()
{
return [
'name' => 'required|string',
'parent_id' => 'nullable|uuid',
'path' => 'sometimes|string',
'is_last' => 'sometimes|string',
'extension' => 'sometimes|string|nullable',
'file' => ['required', 'file', new DisabledMimetypes],
'name' => 'required|string',
'parent_id' => 'sometimes|uuid',
'path' => 'sometimes|string',
'extension' => 'required|string|nullable',
'file' => ['required', 'file', new DisabledMimetypes],
];
}
}
src/Domain/Homepage/Controllers/IndexController.php
+5 -35
View File
@@ -1,51 +1,21 @@
<?php
namespace Domain\Homepage\Controllers;
use DB;
use PDOException;
use Domain\Pages\Models\Page;
use Domain\Settings\Actions\GetConfigAction;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\Foundation\Application;
use Support\Status\Actions\GetServerSetupStatusAction;
class IndexController
{
public function __construct(
public GetServerSetupStatusAction $getServerSetupStatus,
) {
}
public GetConfigAction $getConfig,
) {}
/**
* Show index page
*/
public function __invoke(): Application|Factory|View
public function __invoke(): View
{
$setup_status = 'installation-needed';
try {
// Try to connect to database
DB::getPdo();
// Get setup status
$setup_status = get_setup_status();
// Get app pages
$pages = Page::all();
// Get all settings
$settings = get_settings_in_json();
} catch (PDOException $e) {
}
if ($setup_status === 'installation-needed') {
$status_check = ($this->getServerSetupStatus)();
}
return view('index')
->with('status_check', $status_check ?? [])
->with('settings', $settings ?? null)
->with('legal', $pages ?? null)
->with('installation', $setup_status);
->with('config', json_decode(json_encode(($this->getConfig)())));
}
}
src/Domain/Settings/Actions/GetConfigAction.php
+193
View File
@@ -0,0 +1,193 @@
<?php
namespace Domain\Settings\Actions;
use DB;
use Domain\Pages\Models\Page;
use Domain\Settings\Controllers\GetServerStatusController;
use Monolog\Handler\MissingExtensionException;
use PDOException;
use VueFileManager\Subscription\Domain\Plans\Models\Plan;
use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
use VueFileManager\Subscription\Domain\Transactions\Models\Transaction;
class GetConfigAction
{
public function __construct(
public GetServerStatusController $getServerSetupStatus,
) {}
public function __invoke(): array
{
$setupStatus = 'installation-needed';
$serverInfo = [];
$settings = null;
try {
// Try to connect to database
DB::getPdo();
// Get setup status
$setupStatus = getInstallationStatus();
// Get all settings
$settings = getAllSettings();
// Get app pages
$pages = Page::all();
// Subscription
$isEmptySubscriptions = Subscription::count() === 0;
$isEmptyTransactions = Transaction::count() === 0;
$isEmptyPlans = Plan::count() === 0;
$plan = Plan::where('status', 'active')
->where('type', 'metered');
// User
$isUser = auth()->check();
$user = auth()->user();
// Default user settings
$defaultEmoji = $isUser ? $user->settings->emoji_type : 'twemoji';
$defaultThemeMode = $isUser ? $user->settings->theme_mode : 'system';
} catch (PDOException $e) {
[$isUser, $isEmptyPlans, $isEmptyTransactions, $isEmptySubscriptions] = false;
$pages = null;
$plan = null;
$defaultEmoji = 'twemoji';
$defaultThemeMode = 'system';
}
if ($setupStatus === 'installation-needed') {
$serverInfo = ($this->getServerSetupStatus)();
}
// Bcmath Extension
try {
$storageDefaultSpaceFormatted = isset($settings->default_max_storage_amount)
? toGigabytes($settings->default_max_storage_amount)
: toGigabytes(5);
$uploadLimit = isset($settings->upload_limit)
? toBytes($settings->upload_limit)
: 'undefined';
$chunkSize = isset($settings->chunk_size)
? toBytes($settings->chunk_size)
: toBytes(64);
$uploadLimitFormatted = isset($settings->upload_limit)
? toMegabytes($settings->upload_limit)
: null;
} catch (MissingExtensionException $e) {
$storageDefaultSpaceFormatted = '5GB';
$uploadLimit = 'undefined';
$uploadLimitFormatted = 5;
$chunkSize = 64000000;
}
return [
// App
'host' => url('/'),
'api' => url('/api'),
'locale' => app()->getLocale(),
'isDev' => is_dev() ? 1 : 0,
'isDemo' => config('vuefilemanager.is_demo') ? 1 : 0,
'isSaaS' => $settings && optional($settings)->license === 'extended' ? 1 : 0,
'isAuthenticated' => $isUser ? 1 : 0,
'isSetupWizardDemo' => config('vuefilemanager.is_setup_wizard_demo') ? 1 : 0,
'isSetupWizardDebug' => config('vuefilemanager.is_setup_wizard_debug') ? 1 : 0,
'isAdminVueFileManagerBar' => config('vuefilemanager.is_admin_vuefilemanager_bar', 1) ? 1 : 0,
'installation' => $setupStatus ?? 'initial',
'statusCheck' => json_encode($serverInfo) ?? 'undefined',
// Broadcasting
'broadcasting' => config('broadcasting.default'),
'broadcastingKey' => config('broadcasting.connections.pusher.key'),
'broadcastingHost' => config('broadcasting.connections.pusher.options.host'),
'broadcastingPort' => config('broadcasting.connections.pusher.options.port'),
'broadcastingCluster' => config('broadcasting.connections.pusher.options.cluster'),
// App Logos
'app_logo' => $settings->app_logo ?? null,
'app_logo_dark' => $settings->app_logo_dark ?? null,
'app_logo_horizontal' => $settings->app_logo_horizontal ?? null,
'app_logo_horizontal_dark' => $settings->app_logo_horizontal_dark ?? null,
// App theme
'app_color' => $settings->app_color ?? '#00BC7E',
'app_footer' => $settings->footer_content ?? null,
// App title & name
'app_name' => $settings->app_title ?? 'VueFileManager',
'app_description' => $settings->app_description ?? __t('app_description'),
'defaultEmoji' => $defaultEmoji,
'defaultThemeMode' => $defaultThemeMode,
// Upload settings
'mimetypesBlacklist' => isset($settings->mimetypes_blacklist) ? $settings->mimetypes_blacklist : null,
'storageDefaultSpace' => $settings->default_max_storage_amount ?? 5,
'storageLimit' => $settings->storage_limitation ?? 1,
'storageDefaultSpaceFormatted' => $storageDefaultSpaceFormatted,
'uploadLimitFormatted' => $uploadLimitFormatted,
'uploadLimit' => $uploadLimit,
'chunkSize' => $chunkSize,
// Metered billings
'allowed_registration_bonus' => $settings->allowed_registration_bonus ?? 0,
'registration_bonus_amount' => $settings->registration_bonus_amount ?? 0,
'isCreatedMeteredPlan' => $plan && $plan->exists() ? 1 : 0,
'meteredPlanId' => $plan && $plan->exists() ? $plan->first()->id : null,
// Payments setup
'allowed_payments' => $settings->allowed_payments ?? 0,
'subscriptionType' => $settings->subscription_type ?? 'none',
'isEmptyPlans' => $isEmptyPlans ? 1 : 0,
'isEmptyTransactions' => $isEmptyTransactions ? 1 : 0,
'isEmptySubscriptions' => $isEmptySubscriptions ? 1 : 0,
// Payment gateways
'isPayPal' => $settings->allowed_paypal ?? 0,
'isPaystack' => $settings->allowed_paystack ?? 0,
'isStripe' => $settings->allowed_stripe ?? 0,
'isPayPalLive' => config('subscription.credentials.paypal.is_live') ? 1 : 0,
'paypal_client_id' => config('subscription.credentials.paypal.id'),
'paystack_public_key' => config('subscription.credentials.paystack.public_key'),
'stripe_public_key' => config('subscription.credentials.stripe.public_key'),
'paypal_payment_description' => $settings->paypal_payment_description ?? null,
'paystack_payment_description' => $settings->paystack_payment_description ?? null,
'stripe_payment_description' => $settings->stripe_payment_description ?? null,
// Google reCaptcha
'allowedRecaptcha' => $settings->allowed_recaptcha ?? 0,
'recaptcha_client_id' => config('services.recaptcha.client_id'),
'isRecaptchaConfigured' => config('services.recaptcha.client_id') ? 1 : 0,
// Social Authentication
'allowedFacebookLogin' => $settings->allowed_facebook_login ?? 0,
'allowedGoogleLogin' => $settings->allowed_google_login ?? 0,
'allowedGithubLogin' => $settings->allowed_github_login ?? 0,
'isFacebookLoginConfigured' => config('services.facebook.client_id') ? 1 : 0,
'isGoogleLoginConfigured' => config('services.google.client_id') ? 1 : 0,
'isGithubLoginConfigured' => config('services.github.client_id') ? 1 : 0,
// Google Adsense
'allowedAdsense' => $settings?->allowed_adsense ?? 0,
'adsenseClientId' => $settings->adsense_client_id ?? null,
'adsenseBanner01' => $settings->adsense_banner_01 ?? null,
'adsenseBanner02' => $settings->adsense_banner_02 ?? null,
'adsenseBanner03' => $settings->adsense_banner_03 ?? null,
// Registration
'userRegistration' => $settings->registration ?? 1,
'userVerification' => $settings->user_verification ?? 0,
// Public Pages
'allowHomepage' => $settings->allow_homepage ?? 1,
'teamsDefaultMembers' => $settings->default_max_team_member ?? 10,
'legal' => $pages ? json_encode($pages) : 'undefined',
];
}
}
src/Domain/Settings/Controllers/GetConfigController.php
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace Domain\Settings\Controllers;
use Domain\Settings\Actions\GetConfigAction;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
class GetConfigController extends Controller
{
public function __construct(
public GetConfigAction $getConfigAction,
) {}
public function __invoke(): JsonResponse
{
return response()->json(($this->getConfigAction)());
}
}
src/Domain/Sharing/Controllers/WebCrawlerOpenGraphController.php
+1 -1
View File
@@ -30,7 +30,7 @@ class WebCrawlerOpenGraphController extends Controller
}
return view('vuefilemanager.crawler.og-view')
->with('settings', get_settings_in_json())
->with('settings', getAllSettings())
->with('metadata', [
'url' => url('/share', ['token' => $share->token]),
'is_protected' => (int) $share->is_protected,
src/Domain/UploadRequest/Controllers/UploadFilesForUploadRequestController.php → src/Domain/UploadRequest/Controllers/UploadFileChunksForUploadRequestController.php
+4 -3
View File
@@ -7,11 +7,12 @@ use Illuminate\Support\Str;
use Domain\Folders\Models\Folder;
use Domain\Files\Resources\FileResource;
use Domain\Files\Actions\ProcessFileAction;
use Domain\Files\Requests\UploadChunkRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Domain\Files\Actions\StoreFileChunksAction;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
class UploadFilesForUploadRequestController
class UploadFileChunksForUploadRequestController
{
public function __construct(
private ProcessFileAction $processFie,
@@ -22,7 +23,7 @@ class UploadFilesForUploadRequestController
/**
* @throws FileNotFoundException
*/
public function __invoke(\Domain\Files\Requests\UploadRequest $request, UploadRequest $uploadRequest)
public function __invoke(UploadChunkRequest $request, UploadRequest $uploadRequest)
{
// Get upload request root folder query
$folder = Folder::where('id', $uploadRequest->id);
@@ -41,7 +42,7 @@ class UploadFilesForUploadRequestController
$chunkPath = ($this->storeFileChunks)($request);
// Proceed after last chunk
if ($request->boolean('is_last')) {
if ($request->boolean('is_last_chunk')) {
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');