controller refactoring part 21

This commit is contained in:
Peter Papp
2021-07-21 17:20:19 +02:00
parent 91fc7f2d9d
commit d55f5c3b41
18 changed files with 360 additions and 319 deletions

View File

@@ -1,41 +1,43 @@
<?php
use Domain\Items\Controllers\VisitorDeleteFileOrFolderController;
use Domain\Items\Controllers\VisitorMoveFileOrFolderController;
use Domain\Items\Controllers\VisitorRenameFileOrFolderController;
use Domain\Sharing\Controllers\ShareController;
use Domain\Sharing\Controllers\OGSiteController;
use Domain\Zipping\Controllers\EditorZipFilesController;
use Domain\Files\Controllers\EditorUploadFilesController;
use Domain\Files\Controllers\VisitorUploadFilesController;
use Domain\Zipping\Controllers\EditorZipFolderController;
use Domain\Folders\Controllers\EditorCreateFolderController;
use Domain\Sharing\Controllers\ManipulateShareItemsController;
use Domain\Files\Controllers\VisitorGetSingleFileResourceController;
use Domain\Folders\Controllers\VisitorCreateFolderController;
use Domain\Files\Controllers\VisitorGetSingleFileInfoController;
use Domain\Browsing\Controllers\VisitorBrowseFolderContentController;
use Domain\Folders\Controllers\VisitorNavigationFolderTreeController;
use Domain\Browsing\Controllers\VisitorSearchFilesAndFoldersController;
use Domain\Sharing\Controllers\AuthenticateProtectedSharedItemController;
use Domain\Sharing\Controllers\VisitorAuthenticateProtectedShareController;
// Browse functions
Route::group(['prefix' => 'editor'], function () {
Route::post('/create-folder/{shared}', EditorCreateFolderController::class);
Route::post('/upload/{shared}', EditorUploadFilesController::class);
Route::post('/create-folder/{shared}', VisitorCreateFolderController::class);
Route::post('/upload/{shared}', VisitorUploadFilesController::class);
Route::patch('/rename/{id}/{shared}', [ManipulateShareItemsController::class, 'rename_item']);
Route::post('/remove/{shared}', [ManipulateShareItemsController::class, 'delete_item']);
Route::post('/move/{shared}', [ManipulateShareItemsController::class, 'move']);
Route::patch('/rename/{id}/{shared}', VisitorRenameFileOrFolderController::class);
Route::post('/remove/{shared}', VisitorDeleteFileOrFolderController::class);
Route::post('/move/{shared}', VisitorMoveFileOrFolderController::class);
});
// Zip shared items
Route::group(['prefix' => 'zip'], function () {
Route::post('/files/{shared}', EditorZipFilesController::class);
Route::get('/folder/{id}/{shared}', EditorZipFolderController::class);
Route::post('/files/{shared}', EditorZipFilesController::class);
});
// Browse share content
Route::group(['prefix' => 'browse'], function () {
Route::post('/authenticate/{shared}', AuthenticateProtectedSharedItemController::class);
Route::post('/authenticate/{shared}', VisitorAuthenticateProtectedShareController::class);
Route::get('/folders/{id}/{shared}', VisitorBrowseFolderContentController::class);
Route::get('/navigation/{shared}', VisitorNavigationFolderTreeController::class);
Route::get('/search/{shared}', VisitorSearchFilesAndFoldersController::class);
Route::get('/file/{shared}', VisitorGetSingleFileResourceController::class);
Route::get('/file/{shared}', VisitorGetSingleFileInfoController::class);
Route::get('/share/{shared}', [ShareController::class, 'show']);
});

View File

@@ -5,6 +5,7 @@ use Domain\Files\Models\File;
use App\Http\Controllers\Controller;
use Domain\Files\Requests\UploadRequest;
use Domain\Files\Actions\UploadFileAction;
use Support\Demo\Actions\FakeUploadFileAction;
class UploadFileController extends Controller
{
@@ -14,9 +15,11 @@ class UploadFileController extends Controller
public function __invoke(
UploadRequest $request,
UploadFileAction $uploadFiles,
): File {
FakeUploadFileAction $fakeUploadFile,
): File|array {
if (is_demo_account('howdy@hi5ve.digital')) {
return $this->demo->upload($request);
return ($fakeUploadFile)($request);
}
return ($uploadFiles)($request);

View File

@@ -10,7 +10,7 @@ use Domain\Files\Resources\FileResource;
/**
* Get shared file record
*/
class VisitorGetSingleFileResourceController
class VisitorGetSingleFileInfoController
{
public function __construct(
public HelperService $helper,

View File

@@ -3,6 +3,7 @@ namespace Domain\Files\Controllers;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Support\Demo\Actions\FakeUploadFileAction;
use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Support\Demo\Actions\DemoService;
@@ -12,21 +13,20 @@ use Domain\Files\Actions\UploadFileAction;
/**
* guest user upload file into shared folder
*/
class EditorUploadFilesController extends Controller
class VisitorUploadFilesController extends Controller
{
public function __construct(
public HelperService $helper,
public DemoService $demo,
) {
}
) {}
public function __invoke(
FakeUploadFileAction $fakeUploadFile,
UploadFileAction $uploadFile,
UploadRequest $request,
Share $shared,
): Response | array {
if (is_demo_account($shared->user->email)) {
return $this->demo->upload($request);
return ($fakeUploadFile)($request);
}
// Check ability to access protected share record

View File

@@ -1,34 +1,31 @@
<?php
namespace Domain\Folders\Controllers;
use Auth;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Support\Demo\Actions\DemoService;
use Domain\Folders\Actions\CreateFolderAction;
use Domain\Folders\Requests\CreateFolderRequest;
use Support\Demo\Actions\FakeCreateFolderAction;
class CreateFolderController extends Controller
{
public function __construct(
public DemoService $demo
) {
}
/**
* Create new folder for authenticated master|editor user
*/
public function __invoke(
CreateFolderRequest $request,
CreateFolderAction $createFolder,
): Response {
FakeCreateFolderAction $fakeCreateFolder,
): Response|array {
// If is demo, return fake folder
if (is_demo_account('howdy@hi5ve.digital')) {
return $this->demo->create_folder($request);
if (is_demo_account(Auth::user()->email)) {
return ($fakeCreateFolder)($request);
}
$folder = ($createFolder)($request);
// Create new folder
return response($folder, 201);
}
}

View File

@@ -5,14 +5,9 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Support\Demo\Actions\DemoService;
class FavouriteController extends Controller
{
public function __construct(
public DemoService $demo,
) {
}
/**
* Add folder to user favourites
@@ -24,7 +19,7 @@ class FavouriteController extends Controller
foreach ($request->input('folders') as $id) {
if (is_demo_account($user->email)) {
return $this->demo->favourites($user);
return $user->favouriteFolders->makeHidden(['pivot']);
}
// Add folder to user favourites
@@ -45,7 +40,7 @@ class FavouriteController extends Controller
$user = Auth::user();
if (is_demo_account($user->email)) {
return $this->demo->favourites($user);
return $user->favouriteFolders->makeHidden(['pivot']);
}
// Remove folder from user favourites

View File

@@ -3,30 +3,29 @@ namespace Domain\Folders\Controllers;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Support\Demo\Actions\FakeCreateFolderAction;
use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Support\Demo\Actions\DemoService;
use Domain\Folders\Actions\CreateFolderAction;
use Domain\Folders\Requests\CreateFolderRequest;
/**
* Create new folder for guest user with edit permission
*/
class EditorCreateFolderController extends Controller
class VisitorCreateFolderController extends Controller
{
public function __construct(
public HelperService $helper,
public DemoService $demo,
) {
}
) {}
public function __invoke(
FakeCreateFolderAction $fakeCreateFolderAction,
CreateFolderAction $createFolder,
CreateFolderRequest $request,
Share $shared,
): Response | array {
if (is_demo_account($shared->user->email)) {
return $this->demo->create_folder($request);
return ($fakeCreateFolderAction)($request);
}
// Check ability to access protected share record

View File

@@ -10,6 +10,7 @@ use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Domain\Items\Actions\RenameFileOrFolderAction;
use Domain\Items\Requests\RenameItemRequest;
use Illuminate\Database\Eloquent\Model;
use Support\Demo\Actions\FakeRenameFileOrFolderAction;
class RenameFileOrFolderController extends Controller
{
@@ -20,11 +21,12 @@ class RenameFileOrFolderController extends Controller
RenameItemRequest $request,
string $id,
RenameFileOrFolderAction $renameFileOrFolder,
UpdateFolderPropertyAction $updateFolderProperty
): Model {
UpdateFolderPropertyAction $updateFolderProperty,
FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
): Model|array {
if (is_demo_account(Auth::user()?->email)) {
return $this->demo->rename_item($request, $id);
if (is_demo_account(Auth::user()->email)) {
return ($fakeRenameFileOrFolder)($request, $id);
}
// If request contain icon or color, then change it

View File

@@ -0,0 +1,59 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Domain\Items\Actions\DeleteFileOrFolderAction;
use Domain\Items\Actions\MoveFileOrFolderAction;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\Sharing\Models\Share;
use Illuminate\Http\Response;
use Support\Services\HelperService;
/**
* Delete item for guest user with edit permission
*/
class VisitorDeleteFileOrFolderController extends Controller
{
public function __construct(
private HelperService $helper,
private DeleteFileOrFolderAction $deleteFileOrFolder,
) {}
public function __invoke(
DeleteItemRequest $request,
Share $shared,
): Response {
abort_if(
is_demo_account($shared->user->email), 204, 'Done.'
);
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
// Check shared permission
if (is_visitor($shared)) {
abort(403);
}
foreach ($request->input('items') as $file) {
// Get file|folder item
$item = get_item($file['type'], $file['id']);
// Check access to requested item
if ($file['type'] === 'folder') {
$this->helper->check_item_access($item->id, $shared);
} else {
$this->helper->check_item_access($item->folder_id, $shared);
}
// Delete item
($this->deleteFileOrFolder)($file, $file['id'], $shared);
}
return response('Done', 204);
}
}

View File

@@ -0,0 +1,64 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Domain\Files\Models\File;
use Domain\Items\Actions\MoveFileOrFolderAction;
use Domain\Items\Requests\MoveItemRequest;
use Domain\Sharing\Models\Share;
use Illuminate\Http\Response;
use Support\Services\HelperService;
/**
* Move item for guest user with edit permission
*/
class VisitorMoveFileOrFolderController extends Controller
{
public function __construct(
private HelperService $helper,
private MoveFileOrFolderAction $moveFileOrFolder,
) {}
public function __invoke(
MoveItemRequest $request,
Share $shared,
): Response {
abort_if(
is_demo_account($shared->user->email), 204, 'Done.'
);
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
// Check shared permission
if (is_visitor($shared)) {
abort(403);
}
foreach ($request->input('items') as $item) {
if ($item['type'] === 'folder') {
$this->helper->check_item_access([
$request->input('to_id'), $item['id'],
], $shared);
}
if ($item['type'] !== 'folder') {
$file = File::where('id', $item['id'])
->where('user_id', $shared->user_id)
->firstOrFail();
$this->helper->check_item_access([
$request->input('to_id'), $file->folder_id,
], $shared);
}
}
($this->moveFileOrFolder)($request, $request->to_id);
return response('Done!', 204);
}
}

View File

@@ -0,0 +1,72 @@
<?php
namespace Domain\Items\Controllers;
use App\Http\Controllers\Controller;
use Domain\Folders\Actions\UpdateFolderPropertyAction;
use Domain\Items\Actions\RenameFileOrFolderAction;
use Domain\Items\Requests\RenameItemRequest;
use Domain\Sharing\Models\Share;
use Illuminate\Http\Response;
use Support\Demo\Actions\FakeRenameFileOrFolderAction;
use Support\Services\HelperService;
/**
* Rename item for guest user with edit permission
*/
class VisitorRenameFileOrFolderController extends Controller
{
public function __construct(
private HelperService $helper,
private RenameFileOrFolderAction $renameFileOrFolder,
private UpdateFolderPropertyAction $updateFolderProperty,
private FakeRenameFileOrFolderAction $fakeRenameFileOrFolder,
) {}
public function __invoke(
RenameItemRequest $request,
string $id,
Share $shared,
): Response {
// Return fake renamed item in demo
if (is_demo_account($shared->user->email)) {
return ($this->fakeRenameFileOrFolder)($request, $id);
}
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
// Check shared permission
if (is_visitor($shared)) {
abort(403);
}
// Get file|folder item
$item = get_item($request->input('type'), $id);
// Check access to requested item
if ($request->input('type') === 'folder') {
$this->helper->check_item_access($item->id, $shared);
} else {
$this->helper->check_item_access($item->folder_id, $shared);
}
// If request have a change folder icon values set the folder icon
if ($request->input('type') === 'folder' && $request->filled('icon')) {
($this->updateFolderProperty)($request, $id);
}
// Rename item
$item = ($this->renameFileOrFolder)($request, $id);
// Set public url
if ($item->type !== 'folder') {
$item->setPublicUrl($shared->token);
}
return response($item, 201);
}
}

View File

@@ -1,155 +0,0 @@
<?php
namespace Domain\Sharing\Controllers;
use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Support\Services\HelperService;
use App\Http\Controllers\Controller;
use Support\Demo\Actions\DemoService;
use Support\Services\FileManagerService;
use Domain\Items\Requests\MoveItemRequest;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\Items\Requests\RenameItemRequest;
use Illuminate\Contracts\Routing\ResponseFactory;
class ManipulateShareItemsController extends Controller
{
public function __construct(
private FileManagerService $filemanager,
private HelperService $helper,
private DemoService $demo,
) {
}
/**
* Rename item for guest user with edit permission
*
* @param RenameItemRequest $request
* @param $id
* @param Share $shared
* @return mixed
* @throws \Exception
*/
public function rename_item(RenameItemRequest $request, $id, Share $shared)
{
if (is_demo_account($shared->user->email)) {
return $this->demo->rename_item($request, $id);
}
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
// Check shared permission
if (is_visitor($shared)) {
abort(403);
}
// Get file|folder item
$item = get_item($request->type, $id);
// Check access to requested item
if ($request->type === 'folder') {
$this->helper->check_item_access($item->id, $shared);
} else {
$this->helper->check_item_access($item->folder_id, $shared);
}
// If request have a change folder icon values set the folder icon
if ($request->type === 'folder' && $request->filled('icon')) {
$this->filemanager->edit_folder_properties($request, $id);
}
// Rename item
$item = $this->filemanager->rename_item($request, $id, $shared);
// Set public url
if ($item->type !== 'folder') {
$item->setPublicUrl($shared->token);
}
return response($item, 201);
}
/**
* Delete item for guest user with edit permission
*
* @param DeleteItemRequest $request
* @param Share $shared
* @return ResponseFactory|\Illuminate\Http\Response
* @throws \Exception
*/
public function delete_item(DeleteItemRequest $request, Share $shared)
{
abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
// Check shared permission
if (is_visitor($shared)) {
abort(403);
}
foreach ($request->items as $file) {
// Get file|folder item
$item = get_item($file['type'], $file['id']);
// Check access to requested item
if ($file['type'] === 'folder') {
$this->helper->check_item_access($item->id, $shared);
} else {
$this->helper->check_item_access($item->folder_id, $shared);
}
// Delete item
$this->filemanager->delete_item($file, $file['id'], $shared);
}
return response('Done', 204);
}
/**
* Move item for guest user with edit permission
*
* @param MoveItemRequest $request
* @param Share $shared
* @return ResponseFactory|\Illuminate\Http\Response
*/
public function move(MoveItemRequest $request, Share $shared)
{
abort_if(is_demo_account($shared->user->email), 204, 'Done.');
// Check ability to access protected share record
$this->helper->check_protected_share_record($shared);
// Check shared permission
if (is_visitor($shared)) {
abort(403);
}
foreach ($request->items as $item) {
if ($item['type'] === 'folder') {
$this->helper->check_item_access([
$request->to_id, $item['id'],
], $shared);
}
if ($item['type'] !== 'folder') {
$file = File::where('id', $item['id'])
->where('user_id', $shared->user_id)
->firstOrFail();
$this->helper->check_item_access([
$request->to_id, $file->folder_id,
], $shared);
}
}
$this->filemanager->move($request, $request->to_id);
return response('Done!', 204);
}
}

View File

@@ -9,7 +9,7 @@ use Illuminate\Support\Facades\Hash;
use Domain\Sharing\Resources\ShareResource;
use Domain\Sharing\Requests\AuthenticateShareRequest;
class AuthenticateProtectedSharedItemController extends Controller
class VisitorAuthenticateProtectedShareController extends Controller
{
/**
* Check Password for protected item

View File

@@ -1,114 +0,0 @@
<?php
namespace Support\Demo\Actions;
use ByteUnits\Metric;
use Illuminate\Support\Str;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Domain\Items\Requests\RenameItemRequest;
use Illuminate\Contracts\Routing\ResponseFactory;
class DemoService
{
/**
* Create new directory
*
* @param $request
* @return array
* @throws \Exception
*/
public function create_folder($request)
{
return [
'user_id' => 1,
'id' => Str::uuid(),
'parent_id' => random_int(1000, 9999),
'name' => $request->name,
'type' => 'folder',
'author' => $request->user() ? 'user' : 'visitor',
'items' => '0',
'color' => isset($request->icon['color']) ? $request->icon['color'] : null,
'emoji' => isset($request->icon['emoji']) ? $request->icon['emoji'] : null,
'updated_at' => now()->format('j M Y \a\t H:i'),
'created_at' => now()->format('j M Y \a\t H:i'),
];
}
/**
* Rename item name
*
* @param RenameItemRequest $request
* @param $id
* @return mixed
*/
public function rename_item($request, $id)
{
// Get item
if ($request->type === 'folder') {
$item = Folder::where('id', $id)
->where('user_id', 1)
->first();
} else {
$item = File::where('id', $id)
->where('user_id', 1)
->first();
}
if ($item) {
$item->name = $request->name;
$item->emoji = $request->icon['emoji'] ?? null;
$item->color = $request->icon['color'] ?? null;
return $item;
}
return [
'id' => $request->id,
'name' => $request->name,
'type' => $request->type,
];
}
/**
* Upload file
*
* @param $request
* @return array
* @throws \Exception
*/
public function upload($request)
{
// File
$file = $request->file('file');
$filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName());
$thumbnail = null;
$filesize = $file->getSize();
$filetype = get_file_type($file->getMimeType());
return [
'id' => Str::uuid(),
'folder_id' => $request->parent_id,
'thumbnail' => 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file'))),
'name' => $file->getClientOriginalName(),
'basename' => $filename,
'mimetype' => $file->getClientOriginalExtension(),
'filesize' => Metric::bytes($filesize)->format(),
'type' => $filetype,
'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg',
'author' => $request->user() ? 'user' : 'visitor',
'created_at' => now()->format('j M Y \a\t H:i'),
'updated_at' => now()->format('j M Y \a\t H:i'),
];
}
/**
* Return 204 status
*
* @param $user
* @return ResponseFactory|\Illuminate\Http\Response
*/
public function favourites($user)
{
return $user->favouriteFolders->makeHidden(['pivot']);
}
}

View File

@@ -0,0 +1,32 @@
<?php
namespace Support\Demo\Actions;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
class FakeCreateFolderAction
{
/**
* Create new directory
*/
public function __invoke(
Request $request
): array {
return [
'user_id' => 1,
'id' => Str::uuid(),
'parent_id' => random_int(1000, 9999),
'name' => $request->input('name'),
'type' => 'folder',
'author' => $request->user() ? 'user' : 'visitor',
'items' => '0',
'color' => $request->input('icon.color') ?? null,
'emoji' => $request->input('icon.emoji') ?? null,
'updated_at' => now()->format(__t('time')),
'created_at' => now()->format(__t('time')),
];
}
}

View File

@@ -0,0 +1,44 @@
<?php
namespace Support\Demo\Actions;
use Domain\Files\Models\File;
use Domain\Folders\Models\Folder;
use Domain\Items\Requests\RenameItemRequest;
class FakeRenameFileOrFolderAction
{
/**
* Rename item name
*/
public function __invoke(
RenameItemRequest $request,
string $id,
): array {
// Get item
if ($request->input('type') === 'folder') {
$item = Folder::where('id', $id)
->first();
} else {
$item = File::where('id', $id)
->first();
}
if ($item) {
$item->name = $request->input('name');
$item->emoji = $request->input('icon.emoji') ?? null;
$item->color = $request->input('icon.color') ?? null;
return $item;
}
return [
'id' => $request->input('id'),
'name' => $request->input('name'),
'type' => $request->input('type'),
];
}
}

View File

@@ -0,0 +1,41 @@
<?php
namespace Support\Demo\Actions;
use ByteUnits\Metric;
use Domain\Files\Requests\UploadRequest;
use Illuminate\Support\Str;
class FakeUploadFileAction
{
/**
* Upload file
*/
public function __invoke(
UploadRequest $request
): array {
$file = $request->file('file');
$filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName());
$thumbnail = 'data:' . $request->file('file')->getMimeType() . ';base64, ' . base64_encode(file_get_contents($request->file('file')));
$fileType = get_file_type($file->getMimeType());
$fileSize = Metric::bytes($file->getSize())->format();
return [
'id' => Str::uuid(),
'folder_id' => $request->input('parent_id'),
'thumbnail' => $thumbnail,
'name' => $file->getClientOriginalName(),
'basename' => $filename,
'mimetype' => $file->getClientOriginalExtension(),
'file_url' => 'https://vuefilemanager.hi5ve.digital/assets/vue-file-manager-preview.jpg',
'author' => $request->user() ? 'user' : 'visitor',
'created_at' => now()->format(__t('time')),
'updated_at' => now()->format(__t('time')),
'type' => $fileType,
'filesize' => $fileSize,
];
}
}

View File

@@ -25,6 +25,6 @@ abstract class TestCase extends BaseTestCase
resolve(SetupService::class)->create_directories();
$this->withoutExceptionHandling();
//$this->withoutExceptionHandling();
}
}