api refactoring

This commit is contained in:
Čarodej
2022-05-11 09:19:55 +02:00
parent d2371e667f
commit c0e431b384
76 changed files with 1142 additions and 690 deletions

View File

@@ -43,9 +43,9 @@ class RouteServiceProvider extends ServiceProvider
->middleware('api')
->group(base_path('routes/share.php'));
Route::prefix('api/upload-request')
Route::prefix('api/file-request')
->middleware('api')
->group(base_path('routes/upload-request.php'));
->group(base_path('routes/file-request.php'));
Route::prefix('api/admin')
->middleware(['api', 'auth:sanctum', 'admin'])
@@ -85,5 +85,7 @@ class RouteServiceProvider extends ServiceProvider
? Limit::perMinute(1000)->by($request->user()->id)
: Limit::perMinute(100)->by($request->ip());
});
RateLimiter::for('login', fn (Request $request) => Limit::perMinute(5)->by($request->ip()));
}
}

View File

@@ -0,0 +1,35 @@
<?php
namespace App\Users\Controllers\Account;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Users\Requests\UpdateAvatarRequest;
class UpdateAvatarController extends Controller
{
/**
* Update user settings
*/
public function __invoke(
UpdateAvatarRequest $request
): JsonResponse {
$successMessage = [
'type' => 'success',
'message' => 'The avatar was successfully updated.',
];
// Check if is demo
if (isDemoAccount()) {
return response()->json($successMessage);
}
$request
->user()
->settings()
->update([
'avatar' => store_avatar($request, 'avatar'),
]);
return response()->json($successMessage);
}
}

View File

@@ -3,7 +3,6 @@ namespace App\Users\Controllers\Account;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Database\QueryException;
use App\Users\Requests\UpdateUserProfileSettingsRequest;
@@ -25,23 +24,10 @@ class UpdateProfileSettingsController extends Controller
return response()->json($successMessage);
}
// Get user
$user = Auth::user();
// Update avatar
if ($request->hasFile('avatar')) {
$user
->settings()
->update([
'avatar' => store_avatar($request, 'avatar'),
]);
return response()->json($successMessage);
}
// Try to store user option
try {
$user
$request
->user()
->settings()
->update(make_single_input($request));
} catch (QueryException $e) {

View File

@@ -0,0 +1,39 @@
<?php
namespace App\Users\Controllers\Authentication;
use Hash;
use App\Users\Models\User;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\Users\Requests\LoginUserRequest;
use Illuminate\Validation\ValidationException;
class AuthenticateAndReturnBearerTokenController extends Controller
{
/**
* @throws ValidationException
*/
public function __invoke(LoginUserRequest $request): JsonResponse
{
// Get user
$user = User::where('email', $request->input('email'))
->firstOrFail();
// Check the credentials
if (! Hash::check($request->input('password'), $user->password)) {
throw ValidationException::withMessages(['email' => ['The provided credentials are incorrect.'], ]);
}
// Create access token
$token = $user->createToken('login');
// Return token
return response()->json([
'type' => 'success',
'message' => 'You were successfully authenticated',
'data' => [
'token' => $token->plainTextToken,
],
]);
}
}

View File

@@ -21,7 +21,7 @@ class CheckAccountController extends Controller
return response()->json([
'type' => 'error',
'message' => __t('user_not_fount'),
]);
], 404);
}
return response()->json([

View File

@@ -0,0 +1,33 @@
<?php
namespace App\Users\Controllers\Authentication;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Laravel\Sanctum\PersonalAccessToken;
class DestroyActiveBearerTokenController extends Controller
{
public function __invoke(): JsonResponse
{
[$id, $token] = explode('|', request()->bearerToken(), 2);
// Get token
$instance = PersonalAccessToken::findOrFail($id);
// Check the correct token
if (hash_equals($instance->token, hash('sha256', $token))) {
// Delete token
$instance->delete();
return response()->json([
'type' => 'success',
'message' => 'You were successfully logged out',
]);
}
return response()->json([
'type' => 'error',
'message' => 'You are not authorized',
], 401);
}
}

View File

@@ -109,7 +109,7 @@ class User extends Authenticatable implements MustVerifyEmail
'used' => (float) get_storage_percentage($this->usedCapacity, $this->limitations->max_storage_amount),
'used_formatted' => get_storage_percentage($this->usedCapacity, $this->limitations->max_storage_amount) . '%',
'capacity' => $this->limitations->max_storage_amount,
'capacity_formatted' => format_gigabytes($this->limitations->max_storage_amount),
'capacity_formatted' => toGigabytes($this->limitations->max_storage_amount),
];
}

View File

@@ -59,7 +59,7 @@ class UserLimitation extends Model
return [
'use' => Metric::bytes($userCapacity)->format(),
'total' => format_gigabytes($this->max_storage_amount),
'total' => toGigabytes($this->max_storage_amount),
'percentage' => get_storage_percentage($userCapacity, $this->max_storage_amount),
];
}

View File

@@ -0,0 +1,30 @@
<?php
namespace App\Users\Requests;
use Illuminate\Foundation\Http\FormRequest;
class LoginUserRequest 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 [
'email' => 'required|email',
'password' => 'required|string',
];
}
}

View File

@@ -0,0 +1,29 @@
<?php
namespace App\Users\Requests;
use Illuminate\Foundation\Http\FormRequest;
class UpdateAvatarRequest 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 [
'avatar' => 'required|file',
];
}
}

View File

@@ -24,8 +24,7 @@ class UpdateUserProfileSettingsRequest extends FormRequest
{
return [
'name' => 'required|string',
'value' => 'sometimes|string',
'avatar' => 'sometimes|file',
'value' => 'required|string',
];
}
}

View File

@@ -30,7 +30,7 @@ class UserStorageResource extends JsonResource
'type' => 'storage',
'attributes' => [
'used' => Metric::bytes($this->usedCapacity)->format(),
'capacity' => format_gigabytes($totalCapacity),
'capacity' => toGigabytes($totalCapacity),
'percentage' => (float) get_storage_percentage($this->usedCapacity, $totalCapacity),
],
'meta' => [

View File

@@ -30,7 +30,7 @@ class UserSubscription extends JsonResource
'canceled' => $this->subscription('main')->cancelled(),
'name' => $subscription['product']['name'],
'capacity' => (int) $subscription['product']['metadata']['capacity'],
'capacity_formatted' => format_gigabytes($subscription['product']['metadata']['capacity']),
'capacity_formatted' => toGigabytes($subscription['product']['metadata']['capacity']),
'slug' => $subscription['plan']['id'],
'canceled_at' => format_date($active_subscription['canceled_at'], 'd. M. Y'),
'created_at' => format_date($active_subscription['current_period_start'], 'd. M. Y'),

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(

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);
}

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";
}
}

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);
}
}
}

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);
}
}

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');

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],
];
}
}

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],
];
}
}

View File

@@ -1,51 +1,22 @@
<?php
namespace Domain\Homepage\Controllers;
use DB;
use PDOException;
use Domain\Pages\Models\Page;
use Illuminate\Contracts\View\View;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\Foundation\Application;
use Support\Status\Actions\GetServerSetupStatusAction;
use Domain\Settings\Actions\GetConfigAction;
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)())));
}
}

View File

@@ -1,16 +1,17 @@
<?php
namespace Domain\RemoteUpload\Controllers;
use DB;
use Domain\Folders\Models\Folder;
use Domain\UploadRequest\Models\UploadRequest;
use Domain\RemoteUpload\Requests\RemoteUploadRequest;
use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
class UploadFilesRemotelyForUploadRequestController
{
public function __construct(
private GetContentFromExternalSource $getContentFromExternalSource,
public GetContentFromExternalSource $getContentFromExternalSource,
public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
) {
}
@@ -26,7 +27,7 @@ class UploadFilesRemotelyForUploadRequestController
// Create folder if not exist
if ($folder->doesntExist()) {
$this->createFolder($uploadRequest);
($this->createUploadRequestRootFolder)($uploadRequest);
}
// Set default parent_id for uploaded file
@@ -54,28 +55,4 @@ class UploadFilesRemotelyForUploadRequestController
'message' => 'Files were successfully added to the upload queue.',
], 201);
}
/**
* Create root Upload Request folder
*/
private function createFolder(UploadRequest $uploadRequest): void
{
// Format timestamp
$timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
// Create folder
DB::table('folders')->insert([
'id' => $uploadRequest->id,
'parent_id' => $uploadRequest->folder_id ?? null,
'user_id' => $uploadRequest->user_id,
'name' => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
'created_at' => now(),
'updated_at' => now(),
]);
// Update upload request status
$uploadRequest->update([
'status' => 'filling',
]);
}
}

View File

@@ -0,0 +1,192 @@
<?php
namespace Domain\Settings\Actions;
use DB;
use PDOException;
use Domain\Pages\Models\Page;
use Monolog\Handler\MissingExtensionException;
use VueFileManager\Subscription\Domain\Plans\Models\Plan;
use Domain\Settings\Controllers\GetServerStatusController;
use VueFileManager\Subscription\Domain\Transactions\Models\Transaction;
use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
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',
];
}
}

View File

@@ -0,0 +1,19 @@
<?php
namespace Domain\Settings\Controllers;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Settings\Actions\GetConfigAction;
class GetConfigController extends Controller
{
public function __construct(
public GetConfigAction $getConfigAction,
) {
}
public function __invoke(): JsonResponse
{
return response()->json(($this->getConfigAction)());
}
}

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,

View File

@@ -0,0 +1,32 @@
<?php
namespace Domain\UploadRequest\Actions;
use DB;
use Domain\UploadRequest\Models\UploadRequest;
class CreateUploadRequestRootFolderAction
{
/**
* Create root Upload Request folder
*/
public function __invoke(UploadRequest $uploadRequest): void
{
// Format timestamp
$timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
// Create folder
DB::table('folders')->insert([
'id' => $uploadRequest->id,
'parent_id' => $uploadRequest->folder_id ?? null,
'user_id' => $uploadRequest->user_id,
'name' => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
'created_at' => now(),
'updated_at' => now(),
]);
// Update upload request status
$uploadRequest->update([
'status' => 'filling',
]);
}
}

View File

@@ -2,6 +2,7 @@
namespace Domain\UploadRequest\Controllers;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Actions\CreateFolderAction;
use Domain\UploadRequest\Models\UploadRequest;
@@ -16,16 +17,21 @@ class CreateFolderController
) {
}
public function __invoke(CreateFolderRequest $request, UploadRequest $uploadRequest)
{
public function __invoke(
CreateFolderRequest $request,
UploadRequest $uploadRequest,
): JsonResponse {
// Check privileges
if (! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
return response('Access Denied', 403);
if ($request->has('parent_id') && ! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
return response()->json([
'type' => 'error',
'message' => "You don't have privileges to create folder here",
], 403);
}
// Create new folder
$folder = Folder::create([
'parent_id' => $request->input('parent_id'),
'parent_id' => $request->input('parent_id') ?? $uploadRequest->id,
'name' => $request->input('name'),
'color' => $request->input('color') ?? null,
'emoji' => $request->input('emoji') ?? null,
@@ -35,6 +41,6 @@ class CreateFolderController
]);
// Return new folder
return response(new FolderResource($folder), 201);
return response()->json(new FolderResource($folder), 201);
}
}

View File

@@ -4,14 +4,22 @@ namespace Domain\UploadRequest\Controllers;
use Illuminate\Support\Arr;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Storage;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\UploadRequest\Models\UploadRequest;
class DeleteFileOrFolderController
{
public function __invoke(DeleteItemRequest $request, UploadRequest $uploadRequest)
{
public function __invoke(
DeleteItemRequest $request,
UploadRequest $uploadRequest
): JsonResponse {
$successMessage = [
'type' => 'success',
'message' => 'Items was successfully deleted.',
];
foreach ($request->input('items') as $file) {
// Get file or folder item
$item = get_item($file['type'], $file['id']);
@@ -27,7 +35,7 @@ class DeleteFileOrFolderController
}
}
return response('Done', 204);
return response()->json($successMessage);
}
private function destroyFile(File $file): void

View File

@@ -4,24 +4,28 @@ namespace Domain\UploadRequest\Controllers;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\MoveItemRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Symfony\Component\HttpFoundation\JsonResponse;
class MoveItemInUploadRequestController extends Controller
{
public function __invoke(
MoveItemRequest $request,
UploadRequest $uploadRequest,
) {
): JsonResponse {
foreach ($request->input('items') as $item) {
$item = get_item($item['type'], $item['id']);
// Check privileges
if (! in_array($item['parent_id'], getChildrenFolderIds($uploadRequest->id))) {
return response('Access Denied', 403);
return response()->json(accessDeniedError(), 403);
}
$item->update(['parent_id' => $request->input('to_id') ?? $uploadRequest->id]);
}
return response('Done.', 204);
return response()->json([
'type' => 'success',
'message' => 'Items was successfully moved.',
]);
}
}

View File

@@ -1,16 +1,13 @@
<?php
namespace Domain\UploadRequest\Controllers;
use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse;
use Domain\UploadRequest\Models\UploadRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Domain\UploadRequest\Resources\UploadRequestResource;
use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
class SetUploadRequestAsFilledController
{
public function __invoke(UploadRequest $uploadRequest): Response|Application|ResponseFactory
public function __invoke(UploadRequest $uploadRequest): JsonResponse
{
$uploadRequest->update([
'status' => 'filled',
@@ -21,6 +18,9 @@ class SetUploadRequestAsFilledController
$uploadRequest->user->notify(new UploadRequestFulfilledNotification($uploadRequest));
}
return response(new UploadRequestResource($uploadRequest), 201);
return response()->json([
'type' => 'success',
'message' => 'File request was successfully set as filled',
]);
}
}

View File

@@ -1,35 +1,37 @@
<?php
namespace Domain\UploadRequest\Controllers;
use DB;
use Storage;
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;
use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
class UploadFilesForUploadRequestController
class UploadFileChunksForUploadRequestController
{
public function __construct(
private ProcessFileAction $processFie,
private StoreFileChunksAction $storeFileChunks,
public ProcessFileAction $processFie,
public StoreFileChunksAction $storeFileChunks,
public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
) {
}
/**
* @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);
// Create folder if not exist
if ($folder->doesntExist()) {
$this->createFolder($uploadRequest);
($this->createUploadRequestRootFolder)($uploadRequest);
}
// Set default parent_id for uploaded file
@@ -41,7 +43,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');
@@ -60,28 +62,4 @@ class UploadFilesForUploadRequestController
return response(new FileResource($file), 201);
}
}
/**
* Create root Upload Request folder
*/
private function createFolder(UploadRequest $uploadRequest): void
{
// Format timestamp
$timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
// Create folder
DB::table('folders')->insert([
'id' => $uploadRequest->id,
'parent_id' => $uploadRequest->folder_id ?? null,
'user_id' => $uploadRequest->user_id,
'name' => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
'created_at' => now(),
'updated_at' => now(),
]);
// Update upload request status
$uploadRequest->update([
'status' => 'filling',
]);
}
}

View File

@@ -0,0 +1,56 @@
<?php
namespace Domain\UploadRequest\Controllers;
use Storage;
use Illuminate\Support\Str;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use Domain\Files\Resources\FileResource;
use Domain\Files\Actions\ProcessFileAction;
use Domain\Files\Requests\UploadFileRequest;
use Domain\UploadRequest\Models\UploadRequest;
use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
class UploadFileForUploadRequestController
{
public function __construct(
public ProcessFileAction $processFie,
public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
) {
}
public function __invoke(
UploadFileRequest $request,
UploadRequest $uploadRequest
): JsonResponse {
// Get upload request root folder query
$folder = Folder::where('id', $uploadRequest->id);
// Create folder if it doesn't exist
if ($folder->doesntExist()) {
($this->createUploadRequestRootFolder)($uploadRequest);
}
// Set default parent_id for uploaded file
if (is_null($request->input('parent_id'))) {
$request->merge(['parent_id' => $uploadRequest->id]);
}
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
// Move file to user directory
Storage::disk('local')->put("files/{$uploadRequest->user->id}/$name", $request->file('file')->get());
// Process file
$file = ($this->processFie)($request, $uploadRequest->user, $name);
// Set public access url
$file->setUploadRequestPublicUrl($uploadRequest->id);
// Set timestamp for auto filling
cache()->set("auto-filling.$uploadRequest->id", now()->toString());
return response()->json(new FileResource($file), 201);
}
}

View File

@@ -16,7 +16,10 @@ class ProtectUploadRequestRoutes
// Check if upload request is active
if (! in_array($uploadRequest->status, ['active', 'filling'])) {
return response('Gone', 410);
return response()->json([
'type' => 'gone',
'message' => 'The file request is not active anymore',
], 410);
}
return $next($request);

View File

@@ -3,7 +3,8 @@ namespace Support\Demo\Actions;
use ByteUnits\Metric;
use Illuminate\Support\Str;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Requests\UploadFileRequest;
use Domain\Files\Requests\UploadChunkRequest;
class FakeUploadFileAction
{
@@ -11,7 +12,7 @@ class FakeUploadFileAction
* Upload file
*/
public function __invoke(
UploadRequest $request
UploadChunkRequest|UploadFileRequest $request
): array {
$file = $request->file('file');
$thumbnail = 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file')));

View File

@@ -142,11 +142,11 @@ if (! function_exists('get_settings')) {
}
}
if (! function_exists('get_settings_in_json')) {
if (! function_exists('getAllSettings')) {
/**
* Get all app settings and return them as json
*/
function get_settings_in_json()
function getAllSettings()
{
return json_decode(
Setting::all()
@@ -156,13 +156,13 @@ if (! function_exists('get_settings_in_json')) {
}
}
if (! function_exists('get_setup_status')) {
if (! function_exists('getInstallationStatus')) {
/**
* Check if setup wizard was passed
*
* @return string
*/
function get_setup_status()
function getInstallationStatus()
{
$setup_success = get_settings('setup_wizard_success');
@@ -501,14 +501,14 @@ if (! function_exists('make_single_input')) {
}
}
if (! function_exists('format_gigabytes')) {
if (! function_exists('toGigabytes')) {
/**
* Format integer to gigabytes
*
* @param $gigabytes
* @return string
*/
function format_gigabytes($gigabytes)
function toGigabytes($gigabytes)
{
if ($gigabytes >= 1000) {
return Metric::gigabytes($gigabytes)->format('Tb/');
@@ -518,14 +518,14 @@ if (! function_exists('format_gigabytes')) {
}
}
if (! function_exists('format_megabytes')) {
if (! function_exists('toMegabytes')) {
/**
* Format string to formated megabytes string
*
* @param $megabytes
* @return string
*/
function format_megabytes($megabytes)
function toMegabytes($megabytes)
{
if ($megabytes >= 1000) {
return $megabytes / 1000 . 'GB';
@@ -539,14 +539,14 @@ if (! function_exists('format_megabytes')) {
}
}
if (! function_exists('format_bytes')) {
if (! function_exists('toBytes')) {
/**
* Convert megabytes to bytes
*
* @param $megabytes
* @return int|string
*/
function format_bytes($megabytes)
function toBytes($megabytes)
{
return Metric::megabytes($megabytes)->numberOfBytes();
}