mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-21 20:44:42 +00:00
refactor user in upload controllers
This commit is contained in:
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
APP_NAME=Laravel
|
APP_NAME=Laravel
|
||||||
APP_ENV=local
|
APP_ENV=local
|
||||||
APP_KEY=base64:8lOt4iwu42v5k2gtFMMiVwlK+Lrms8ZCPx9f6dp0Qlo=
|
APP_KEY=base64:k5FduZ4Vu5ONvcJysN6xZYlix606oNocewyXSyOEspQ=
|
||||||
APP_DEBUG=true
|
APP_DEBUG=true
|
||||||
APP_URL=http://localhost
|
APP_URL=http://localhost
|
||||||
APP_DEMO=false
|
APP_DEMO=false
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ use VueFileManager\Subscription\App\User\Traits\Billable;
|
|||||||
* @method static where(string $string, string $string1)
|
* @method static where(string $string, string $string1)
|
||||||
* @method static create(array $array)
|
* @method static create(array $array)
|
||||||
* @method static find(mixed $email)
|
* @method static find(mixed $email)
|
||||||
|
* @method canUpload(int $size)
|
||||||
*/
|
*/
|
||||||
class User extends Authenticatable implements MustVerifyEmail
|
class User extends Authenticatable implements MustVerifyEmail
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Domain\Files\Actions;
|
namespace Domain\Files\Actions;
|
||||||
|
|
||||||
|
use App\Users\Models\User;
|
||||||
use Illuminate\Support\Str;
|
use Illuminate\Support\Str;
|
||||||
use Domain\Files\Models\File;
|
use Domain\Files\Models\File;
|
||||||
use Domain\Folders\Models\Folder;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
use Illuminate\Support\Facades\Storage;
|
||||||
use Domain\Files\Requests\UploadRequest;
|
use Domain\Files\Requests\UploadRequest;
|
||||||
use Domain\Traffic\Actions\RecordUploadAction;
|
use Domain\Traffic\Actions\RecordUploadAction;
|
||||||
@@ -25,7 +25,7 @@ class ProcessFileAction
|
|||||||
*/
|
*/
|
||||||
public function __invoke(
|
public function __invoke(
|
||||||
UploadRequest $request,
|
UploadRequest $request,
|
||||||
?string $userId,
|
User $user,
|
||||||
string $chunkPath,
|
string $chunkPath,
|
||||||
) {
|
) {
|
||||||
// Get local disk instance
|
// Get local disk instance
|
||||||
@@ -44,11 +44,6 @@ class ProcessFileAction
|
|||||||
abort(413);
|
abort(413);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Get user
|
|
||||||
$user = $request->filled('parent_id')
|
|
||||||
? Folder::find($request->input('parent_id'))->getLatestParent()->user
|
|
||||||
: auth()->user();
|
|
||||||
|
|
||||||
// Check if user has enough space to upload file
|
// Check if user has enough space to upload file
|
||||||
if (! $user->canUpload($size)) {
|
if (! $user->canUpload($size)) {
|
||||||
// Delete file from chunk directory
|
// Delete file from chunk directory
|
||||||
@@ -86,7 +81,7 @@ class ProcessFileAction
|
|||||||
'basename' => $name,
|
'basename' => $name,
|
||||||
'filesize' => $size,
|
'filesize' => $size,
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'creator_id' => auth()->id(),
|
'creator_id' => auth()->check() ? auth()->id() : $user->id,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// Store file exif data
|
// Store file exif data
|
||||||
|
|||||||
@@ -23,7 +23,9 @@ class RemoteUploadFileController extends Controller
|
|||||||
|
|
||||||
// Get user
|
// Get user
|
||||||
$user = $request->filled('parent_id')
|
$user = $request->filled('parent_id')
|
||||||
? Folder::find($request->input('parent_id'))->getLatestParent()->user
|
? Folder::find($request->input('parent_id'))
|
||||||
|
->getLatestParent()
|
||||||
|
->user
|
||||||
: auth()->user();
|
: auth()->user();
|
||||||
|
|
||||||
// Execute job for get content from url and save
|
// Execute job for get content from url and save
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
namespace Domain\Files\Controllers;
|
namespace Domain\Files\Controllers;
|
||||||
|
|
||||||
|
use Domain\Folders\Models\Folder;
|
||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Domain\Files\Requests\UploadRequest;
|
use Domain\Files\Requests\UploadRequest;
|
||||||
use Domain\Files\Resources\FileResource;
|
use Domain\Files\Resources\FileResource;
|
||||||
@@ -34,8 +35,15 @@ class UploadFileController extends Controller
|
|||||||
|
|
||||||
// Proceed after last chunk
|
// Proceed after last chunk
|
||||||
if ($request->boolean('is_last')) {
|
if ($request->boolean('is_last')) {
|
||||||
|
// Get user
|
||||||
|
$user = $request->filled('parent_id')
|
||||||
|
? Folder::find($request->input('parent_id'))
|
||||||
|
->getLatestParent()
|
||||||
|
->user
|
||||||
|
: auth()->user();
|
||||||
|
|
||||||
// Process file
|
// Process file
|
||||||
$file = ($this->processFie)($request, null, $chunkPath);
|
$file = ($this->processFie)($request, $user, $chunkPath);
|
||||||
|
|
||||||
return response(new FileResource($file), 201);
|
return response(new FileResource($file), 201);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ class VisitorUploadFileController extends Controller
|
|||||||
// Proceed after last chunk
|
// Proceed after last chunk
|
||||||
if ($request->boolean('is_last')) {
|
if ($request->boolean('is_last')) {
|
||||||
// Process file
|
// Process file
|
||||||
$file = ($this->processFie)($request, $shared->user_id, $chunkPath);
|
$file = ($this->processFie)($request, $shared->user, $chunkPath);
|
||||||
|
|
||||||
// Set public access url
|
// Set public access url
|
||||||
$file->setSharedPublicUrl($shared->token);
|
$file->setSharedPublicUrl($shared->token);
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ class UploadFilesForUploadRequestController
|
|||||||
// Proceed after last chunk
|
// Proceed after last chunk
|
||||||
if ($request->boolean('is_last')) {
|
if ($request->boolean('is_last')) {
|
||||||
// Process file
|
// Process file
|
||||||
$file = ($this->processFie)($request, $uploadRequest->user_id, $chunkPath);
|
$file = ($this->processFie)($request, $uploadRequest->user, $chunkPath);
|
||||||
|
|
||||||
// Set public access url
|
// Set public access url
|
||||||
$file->setUploadRequestPublicUrl($uploadRequest->id);
|
$file->setUploadRequestPublicUrl($uploadRequest->id);
|
||||||
|
|||||||
Reference in New Issue
Block a user