nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-04-06 02:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

share routes refactoring

Browse Source
This commit is contained in:
Čarodej
2022-05-13 11:40:39 +02:00
parent c0e431b384
commit 69a48e8925
35 changed files with 267 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.testing
View File

@@ -1,6 +1,6 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=base64:qO2rFS9MzY3SKl6AqwV1jMAshl9jiaC02VNjXMhrMpo=
APP_KEY=base64:z6k1PzCZHXgOlUdNwFJzjKtyxIy8Qczl3POYpk3O94A=
APP_DEBUG=true
APP_URL=http://localhost
APP_DEMO=false

18
public/mix-manifest.json
View File

@@ -1,6 +1,6 @@
{
"/js/main.js": "/js/main.js",
"/chunks/request.js": "/chunks/request.js?id=4f2f083839a7f102",
"/chunks/request.js": "/chunks/request.js?id=2bbfd08f4a543123",
"/chunks/request-upload.js": "/chunks/request-upload.js?id=1201e261c848a844",
"/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=19a0784e59d768ec",
"/chunks/status-check.js": "/chunks/status-check.js?id=a5ba5fb895af7040",
@@ -9,13 +9,13 @@
"/chunks/environment.js": "/chunks/environment.js?id=e4fdb87ff173d48a",
"/chunks/app-setup.js": "/chunks/app-setup.js?id=cbe7bfed06400736",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=78d257775f5fc485",
"/chunks/shared.js": "/chunks/shared.js?id=54c3bc26f2aab8d6",
"/chunks/shared.js": "/chunks/shared.js?id=2fd6e7e80c7a6090",
"/chunks/shared/browser.js": "/chunks/shared/browser.js?id=ebf193e6828917dc",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=e1ca697ccf4363dc",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=b5519d193bce2339",
"/chunks/shared/single-file.js": "/chunks/shared/single-file.js?id=f03ab6659c6c1e9b",
"/chunks/shared/authenticate.js": "/chunks/shared/authenticate.js?id=cd743a710a7dd6b4",
"/chunks/not-found.js": "/chunks/not-found.js?id=d31bd699138cf828",
"/chunks/temporary-unavailable.js": "/chunks/temporary-unavailable.js?id=26798085f527d955",
"/chunks/admin.js": "/chunks/admin.js?id=60aa9e8508a842a1",
"/chunks/admin.js": "/chunks/admin.js?id=c9419b333cc023a5",
"/chunks/dashboard.js": "/chunks/dashboard.js?id=5ab55a12214433c8",
"/chunks/invoices.js": "/chunks/invoices.js?id=799928609f57ca10",
"/chunks/subscriptions.js": "/chunks/subscriptions.js?id=a0c4f59d0ec4aee0",
@@ -51,18 +51,19 @@
"/chunks/homepage.js": "/chunks/homepage.js?id=55c3e017e2a12876",
"/chunks/dynamic-page.js": "/chunks/dynamic-page.js?id=9553d7a2912cb901",
"/chunks/contact-us.js": "/chunks/contact-us.js?id=ea99d85aa3500595",
"/chunks/demo.js": "/chunks/demo.js?id=355303e4230cb5ae",
"/chunks/successfully-email-verified.js": "/chunks/successfully-email-verified.js?id=c26cb144101e7c79",
"/chunks/successfully-email-send.js": "/chunks/successfully-email-send.js?id=170d814982e1c475",
"/chunks/sign-in.js": "/chunks/sign-in.js?id=1631a0f4a4ad25c2",
"/chunks/sign-up.js": "/chunks/sign-up.js?id=2af6073efe54c560",
"/chunks/forgotten-password.js": "/chunks/forgotten-password.js?id=ff8954243e86c1e1",
"/chunks/create-new-password.js": "/chunks/create-new-password.js?id=2f0401ee2fc148c4",
"/chunks/settings.js": "/chunks/settings.js?id=2f6576332da7cad2",
"/chunks/settings.js": "/chunks/settings.js?id=22509bd0c45c0159",
"/chunks/profile.js": "/chunks/profile.js?id=3e24bb5e1f52d4bb",
"/chunks/settings-password.js": "/chunks/settings-password.js?id=d00bf503d8126dc4",
"/chunks/settings-storage.js": "/chunks/settings-storage.js?id=ecfee7f7e98204f8",
"/chunks/billing.js": "/chunks/billing.js?id=dd217d680baafb84",
"/chunks/platform.js": "/chunks/platform.js?id=220943bcb1e9f3ca",
"/chunks/platform.js": "/chunks/platform.js?id=a31d808015c4e7ea",
"/chunks/files.js": "/chunks/files.js?id=5f29f35c280e680b",
"/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=6f43aea38e0927bc",
"/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=6e819ffe88a0fd1d",
@@ -71,6 +72,5 @@
"/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=e86d3c1f72e6fde2",
"/chunks/invitation.js": "/chunks/invitation.js?id=424b2783d9785a09",
"/css/tailwind.css": "/css/tailwind.css",
"/css/app.css": "/css/app.css",
"/chunks/demo.js": "/chunks/demo.js?id=355303e4230cb5ae"
"/css/app.css": "/css/app.css"
}

2
resources/js/components/RemoteUpload/RemoteUploadPopup.vue
View File

@@ -106,7 +106,7 @@ export default {
// Get route
let route = {
RequestUpload: `/api/file-request/${this.$router.currentRoute.params.token}/upload/remote`,
Public: `/api/editor/upload/remote/${this.$router.currentRoute.params.token}`,
Public: `/api/sharing/upload/remote/${this.$router.currentRoute.params.token}`,
}[this.$router.currentRoute.name] || '/api/upload/remote'
let parentId = this.$store.getters.currentFolder

2
resources/js/components/Spotlight/Spotlight.vue
View File

@@ -890,7 +890,7 @@ export default {
// Get route
let route = this.$store.getters.sharedDetail
? `/api/search/${this.$router.currentRoute.params.token}`
? `/api/sharing/search/${this.$router.currentRoute.params.token}`
: '/api/search'
axios

2
resources/js/store/modules/fileBrowser.js vendored
View File

@@ -105,7 +105,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/navigation`,
Public: `/api/browse/navigation/${router.currentRoute.params.token}`,
Public: `/api/sharing/navigation/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/browse/navigation'
axios

14
resources/js/store/modules/fileFunctions.js vendored
View File

@@ -34,7 +34,7 @@ const actions = {
// Get route
let route = getters.sharedDetail
? `/api/zip/${router.currentRoute.params.token}?items=${files.join(',')}`
? `/api/sharing/zip/${router.currentRoute.params.token}?items=${files.join(',')}`
: `/api/zip?items=${files.join(',')}`
// Download zip
@@ -60,14 +60,14 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/move`,
Public: `/api/editor/move/${router.currentRoute.params.token}`,
Public: `/api/sharing/move/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/move'
let moveToId = to_item.data ? to_item.data.id : to_item.id
axios
.post(route, {
to_id: moveToId || null,
to_id: moveToId || undefined,
items: itemsToMove,
})
.then(() => {
@@ -88,7 +88,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/create-folder`,
Public: `/api/editor/create-folder/${router.currentRoute.params.token}`,
Public: `/api/sharing/create-folder/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/create-folder'
axios
@@ -127,7 +127,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/rename/${data.id}`,
Public: `/api/editor/rename/${data.id}/${router.currentRoute.params.token}`,
Public: `/api/sharing/rename/${data.id}/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || `/api/rename/${data.id}`
axios
@@ -150,7 +150,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/upload/chunks`,
Public: `/api/editor/upload/chunks/${router.currentRoute.params.token}`,
Public: `/api/sharing/upload/chunks/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/upload/chunks'
// Create cancel token for axios cancellation
@@ -320,7 +320,7 @@ const actions = {
// Get route
let route = {
RequestUpload: `/api/file-request/${router.currentRoute.params.token}/remove`,
Public: `/api/editor/remove/${router.currentRoute.params.token}`,
Public: `/api/sharing/remove/${router.currentRoute.params.token}`,
}[router.currentRoute.name] || '/api/remove'
axios

4
resources/js/store/modules/sharing.js vendored
View File

@@ -25,7 +25,7 @@ const actions = {
return new Promise((resolve, reject) => {
axios
.get(`/api/browse/folders/${id}/${router.currentRoute.params.token}${getters.sorting.URI}`)
.get(`/api/sharing/folders/${id}/${router.currentRoute.params.token}${getters.sorting.URI}`)
.then((response) => {
let folders = response.data.folders.data
let files = response.data.files.data
@@ -50,7 +50,7 @@ const actions = {
getShareDetail: ({ commit, state }, token) => {
return new Promise((resolve, reject) => {
axios
.get(`/api/browse/share/${token}`)
.get(`/api/sharing/share/${token}`)
.then((response) => {
resolve(response)

2
resources/js/views/SharedAuthentication.vue
View File

@@ -78,7 +78,7 @@ export default {
// Send request to get verify account
axios
.post('/api/browse/authenticate/' + this.$route.params.token, {
.post('/api/sharing/authenticate/' + this.$route.params.token, {
password: this.password,
})
.then((response) => {

2
resources/js/views/SharedSingleFile.vue
View File

@@ -108,7 +108,7 @@ export default {
},
mounted() {
axios
.get(`/api/browse/file/${this.$router.currentRoute.params.token}`)
.get(`/api/sharing/file/${this.$router.currentRoute.params.token}`)
.then((response) => {
this.file = response.data
})

4
routes/api.php
View File

@@ -1,8 +1,8 @@
<?php
use Domain\Zip\Controllers\ZipController;
use Domain\Pages\Controllers\PagesController;
use Domain\Sharing\Controllers\ShareController;
use Domain\Pages\Controllers\ShowPageController;
use Domain\Trash\Controllers\DumpTrashController;
use App\Users\Controllers\ResetPasswordController;
use Domain\Files\Controllers\UploadFileController;
@@ -41,7 +41,7 @@ Route::get('/ping', PingAPIController::class);
Route::get('/config', GetConfigController::class);
// Pages
Route::apiResource('/page', PagesController::class);
Route::get('/page/{page}', ShowPageController::class);
// Homepage
Route::post('/contact', SendContactMessageController::class);

36
routes/share.php
View File

@@ -3,6 +3,7 @@
use Domain\Sharing\Controllers\ShareController;
use Domain\Zip\Controllers\VisitorZipController;
use Domain\Files\Controllers\VisitorShowFileController;
use Domain\Files\Controllers\VisitorUploadFileController;
use Domain\Folders\Controllers\VisitorCreateFolderController;
use Domain\Sharing\Controllers\WebCrawlerOpenGraphController;
use Domain\Browsing\Controllers\VisitorBrowseFolderController;
@@ -15,29 +16,26 @@ use Domain\Folders\Controllers\VisitorNavigationFolderTreeController;
use Domain\RemoteUpload\Controllers\VisitorRemoteUploadFileController;
use Domain\Browsing\Controllers\VisitorSearchFilesAndFoldersController;
// Browse functions
Route::group(['prefix' => 'editor'], function () {
Route::post('/upload/remote/{shared}', VisitorRemoteUploadFileController::class);
Route::post('/upload/chunks/{shared}', VisitorUploadFileChunksController::class);
// Creating
Route::post('/upload/remote/{shared}', VisitorRemoteUploadFileController::class);
Route::post('/upload/chunks/{shared}', VisitorUploadFileChunksController::class);
Route::post('/upload/{shared}', VisitorUploadFileController::class);
Route::post('/create-folder/{shared}', VisitorCreateFolderController::class);
Route::post('/create-folder/{shared}', VisitorCreateFolderController::class);
Route::patch('/rename/{id}/{shared}', VisitorRenameFileOrFolderController::class);
Route::post('/remove/{shared}', VisitorDeleteFileOrFolderController::class);
Route::post('/move/{shared}', VisitorMoveFileOrFolderController::class);
});
// Zip shared items
Route::get('/zip/{shared}', VisitorZipController::class);
// Editing
Route::patch('/rename/{id}/{shared}', VisitorRenameFileOrFolderController::class);
Route::post('/remove/{shared}', VisitorDeleteFileOrFolderController::class);
Route::post('/move/{shared}', VisitorMoveFileOrFolderController::class);
// Browse share content
Route::group(['prefix' => 'browse'], function () {
Route::post('/authenticate/{shared}', VisitorUnlockLockedShareController::class);
Route::get('/navigation/{shared}', VisitorNavigationFolderTreeController::class);
Route::get('/folders/{id}/{shared}', VisitorBrowseFolderController::class);
Route::get('/file/{shared}', VisitorShowFileController::class);
Route::get('/share/{share}', [ShareController::class, 'show']);
});
Route::post('/authenticate/{shared}', VisitorUnlockLockedShareController::class);
Route::get('/navigation/{shared}', VisitorNavigationFolderTreeController::class);
Route::get('/folders/{id}/{shared}', VisitorBrowseFolderController::class);
Route::get('/file/{shared}', VisitorShowFileController::class);
Route::get('/share/{share}', [ShareController::class, 'show']);
// Others
Route::get('/search/{shared}', VisitorSearchFilesAndFoldersController::class);
Route::get('/og-site/{share}', WebCrawlerOpenGraphController::class);
Route::get('/zip/{shared}', VisitorZipController::class);

5
src/App/Exceptions/Handler.php
View File

@@ -51,9 +51,12 @@ class Handler extends ExceptionHandler
{
if ($exception instanceof ModelNotFoundException) {
if (in_array('application/json', $request->getAcceptableContentTypes())) {
// Get ids
$ids = implode(', ', $exception->getIds());
return response()->json([
'type' => 'error',
'message' => "We couldn't find your requested item.",
'message' => "We couldn't find the resource you requested with id $ids",
], 404);
}

2
src/App/Providers/RouteServiceProvider.php
View File

@@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider
->middleware('api')
->group(base_path('routes/api.php'));
Route::prefix('api')
Route::prefix('api/sharing')
->middleware('api')
->group(base_path('routes/share.php'));

7
src/Domain/Browsing/Controllers/VisitorBrowseFolderController.php
View File

@@ -4,6 +4,7 @@ namespace Domain\Browsing\Controllers;
use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Resources\FolderCollection;
@@ -24,7 +25,7 @@ class VisitorBrowseFolderController
public function __invoke(
string $id,
Share $shared,
): array {
): JsonResponse {
// Check ability to access protected share record
($this->protectShareRecord)($shared);
@@ -48,10 +49,10 @@ class VisitorBrowseFolderController
// Set thumbnail links for public files
$files->map(fn ($file) => $file->setSharedPublicUrl($shared->token));
return [
return response()->json([
'folders' => new FolderCollection($folders),
'files' => new FilesCollection($files),
'root' => new FolderResource($requestedFolder),
];
]);
}
}

7
src/Domain/Browsing/Controllers/VisitorSearchFilesAndFoldersController.php
View File

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use Domain\Files\Models\File;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Files\Resources\FilesCollection;
use Domain\Folders\Resources\FolderCollection;
@@ -24,7 +25,7 @@ class VisitorSearchFilesAndFoldersController extends Controller
public function __invoke(
Request $request,
Share $shared,
): array {
): JsonResponse {
// Check ability to access protected share record
($this->protectShareRecord)($shared);
@@ -70,9 +71,9 @@ class VisitorSearchFilesAndFoldersController extends Controller
->take(3);
// Collect folders and files to single array
return [
return response()->json([
'folders' => new FolderCollection($folders),
'files' => new FilesCollection($files),
];
]);
}
}

6
src/Domain/Files/Controllers/VisitorShowFileController.php
View File

@@ -3,8 +3,8 @@ namespace Domain\Files\Controllers;
use Gate;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use Domain\Files\Resources\FileResource;
/**
@@ -14,7 +14,7 @@ class VisitorShowFileController
{
public function __invoke(
Share $shared
): Response {
): JsonResponse {
$file = File::whereUserId($shared->user_id)
->whereId($shared->item_id)
->firstOrFail();
@@ -24,6 +24,6 @@ class VisitorShowFileController
// Set access urls
$file->setSharedPublicUrl($shared->token);
return response(new FileResource($file), 200);
return response()->json(new FileResource($file));
}
}

7
src/Domain/Files/Controllers/VisitorUploadFileChunksController.php
View File

@@ -44,7 +44,12 @@ class VisitorUploadFileChunksController extends Controller
// Check shared permission
if (is_visitor($shared)) {
abort(403);
return response()->json(accessDeniedError(), 403);
}
// Add default parent id if missing
if ($request->missing('parent_id')) {
$request->merge(['parent_id' => $shared->item_id]);
}
// Check access to requested directory

73
src/Domain/Files/Controllers/VisitorUploadFileController.php Normal file
View File

@@ -0,0 +1,73 @@
<?php
namespace Domain\Files\Controllers;
use Str;
use Storage;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
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 Domain\Sharing\Actions\ProtectShareRecordAction;
use Domain\Sharing\Actions\VerifyAccessToItemAction;
use Illuminate\Contracts\Filesystem\FileNotFoundException;
/**
* guest user upload file into shared folder
*/
class VisitorUploadFileController extends Controller
{
public function __construct(
public ProcessFileAction $processFie,
public StoreFileChunksAction $storeFileChunks,
private FakeUploadFileAction $fakeUploadFile,
private ProtectShareRecordAction $protectShareRecord,
private VerifyAccessToItemAction $verifyAccessToItem,
) {
}
/**
* @throws FileNotFoundException
*/
public function __invoke(
UploadFileRequest $request,
Share $shared,
): JsonResponse {
if (isDemoAccount()) {
return response()->json(($this->fakeUploadFile)($request), 201);
}
// Check ability to access protected share record
($this->protectShareRecord)($shared);
// Check shared permission
if (is_visitor($shared)) {
return response()->json(accessDeniedError(), 403);
}
// Add default parent id if missing
if ($request->missing('parent_id')) {
$request->merge(['parent_id' => $shared->item_id]);
}
// Check access to requested directory
($this->verifyAccessToItem)($request->input('parent_id'), $shared);
// Get file name
$name = Str::uuid() . '.' . $request->input('extension');
// Put file to user directory
Storage::disk('local')->put("files/$shared->user_id/$name", $request->file('file')->get());
// Process file
$file = ($this->processFie)($request, $shared->user, $name);
// Set public access url
$file->setSharedPublicUrl($shared->token);
return response()->json(new FileResource($file), 201);
}
}

19
src/Domain/Folders/Controllers/VisitorCreateFolderController.php
View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Folders\Controllers;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Folders\Resources\FolderResource;
use Domain\Folders\Actions\CreateFolderAction;
@@ -28,11 +28,11 @@ class VisitorCreateFolderController extends Controller
public function __invoke(
CreateFolderRequest $request,
Share $shared,
): Response | array {
): JsonResponse {
if (isDemoAccount()) {
$fakeFolder = ($this->fakeCreateFolder)($request);
return response(new FolderResource($fakeFolder), 201);
return response()->json(new FolderResource($fakeFolder), 201);
}
// Check ability to access protected share record
@@ -40,21 +40,26 @@ class VisitorCreateFolderController extends Controller
// Check shared permission
if (is_visitor($shared)) {
abort(403);
return response()->json(accessDeniedError(), 403);
}
// Add default parent id if missing
if ($request->missing('parent_id')) {
$request->merge(['parent_id' => $shared->item_id]);
}
// Check access to requested directory
($this->verifyAccessToItem)($request->parent_id, $shared);
($this->verifyAccessToItem)($request->input('parent_id'), $shared);
try {
// Create new folder
$folder = ($this->createFolder)($request, $shared);
// Return new folder
return response(new FolderResource($folder), 201);
return response()->json(new FolderResource($folder), 201);
} catch (InvalidUserActionException $e) {
// Return error response
return response([
return response()->json([
'type' => 'error',
'message' => $e->getMessage(),
], 401);

7
src/Domain/Folders/Controllers/VisitorNavigationFolderTreeController.php
View File

@@ -3,6 +3,7 @@ namespace Domain\Folders\Controllers;
use Domain\Sharing\Models\Share;
use Domain\Folders\Models\Folder;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Sharing\Actions\ProtectShareRecordAction;
use Domain\Sharing\Actions\VerifyAccessToItemAction;
@@ -20,7 +21,7 @@ class VisitorNavigationFolderTreeController extends Controller
public function __invoke(
Share $shared,
): array {
): JsonResponse {
// Check ability to access protected share record
($this->protectShareRecord)($shared);
@@ -34,7 +35,7 @@ class VisitorNavigationFolderTreeController extends Controller
->sortable()
->get(['id', 'parent_id', 'id', 'name']);
return [
return response()->json([
[
'name' => __t('home'),
'location' => 'public',
@@ -42,6 +43,6 @@ class VisitorNavigationFolderTreeController extends Controller
'isMovable' => true,
'isOpen' => true,
],
];
]);
}
}

25
src/Domain/Homepage/Controllers/SendContactMessageController.php
View File

@@ -1,7 +1,7 @@
<?php
namespace Domain\Homepage\Controllers;
use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Mail;
use Domain\Homepage\Mail\SendContactMessage;
@@ -14,17 +14,22 @@ class SendContactMessageController extends Controller
*/
public function __invoke(
SendContactMessageRequest $request
): Response {
// Abort in demo mode
abort_if(is_demo(), 201, 'Done');
): JsonResponse {
$message = [
'type' => 'success',
'message' => 'The message was successfully send',
];
$contactEmail = get_settings('contact_email');
if ($contactEmail) {
Mail::to($contactEmail)
->send(new SendContactMessage($request->all()));
// Return success in demo mode
if (is_demo()) {
return response()->json($message);
}
return response('Done', 201);
// Get contact mail
if ($contactEmail = get_settings('contact_email')) {
Mail::to($contactEmail)->send(new SendContactMessage($request->all()));
}
return response()->json($message);
}
}

15
src/Domain/Items/Controllers/VisitorDeleteFileOrFolderController.php
View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Items\Controllers;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\DeleteItemRequest;
use Domain\Items\Actions\DeleteFileOrFolderAction;
@@ -22,14 +22,19 @@ class VisitorDeleteFileOrFolderController extends Controller
public function __invoke(
DeleteItemRequest $request,
Share $shared,
): Response {
): JsonResponse {
$message = [
'type' => 'success',
'message' => 'Items was successfully deleted.',
];
if (isDemoAccount()) {
abort(204, 'Done.');
return response()->json($message, 204);
}
// Check shared permission
if (is_visitor($shared)) {
abort(403);
return response()->json(accessDeniedError(), 403);
}
foreach ($request->input('items') as $file) {
@@ -47,6 +52,6 @@ class VisitorDeleteFileOrFolderController extends Controller
($this->deleteFileOrFolder)($file, $file['id'], $shared);
}
return response('Done', 204);
return response()->json($message, 204);
}
}

20
src/Domain/Items/Controllers/VisitorMoveFileOrFolderController.php
View File

@@ -2,8 +2,8 @@
namespace Domain\Items\Controllers;
use Domain\Files\Models\File;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Items\Requests\MoveItemRequest;
use Domain\Items\Actions\MoveFileOrFolderAction;
@@ -23,14 +23,24 @@ class VisitorMoveFileOrFolderController extends Controller
public function __invoke(
MoveItemRequest $request,
Share $shared,
): Response {
): JsonResponse {
$successMessage = [
'type' => 'success',
'message' => 'Items was successfully moved.',
];
if (isDemoAccount()) {
abort(204, 'Done.');
return response()->json($successMessage);
}
// Check shared permission
if (is_visitor($shared)) {
abort(403);
return response()->json(accessDeniedError(), 403);
}
// Add default parent id if missing
if ($request->missing('to_id')) {
$request->merge(['to_id' => $shared->item_id]);
}
foreach ($request->input('items') as $item) {
@@ -53,6 +63,6 @@ class VisitorMoveFileOrFolderController extends Controller
($this->moveFileOrFolder)($request, $shared);
return response('Done.', 204);
return response()->json($successMessage);
}
}

12
src/Domain/Items/Controllers/VisitorRenameFileOrFolderController.php
View File

@@ -1,8 +1,8 @@
<?php
namespace Domain\Items\Controllers;
use Illuminate\Http\Response;
use Domain\Sharing\Models\Share;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Files\Resources\FileResource;
use Domain\Folders\Resources\FolderResource;
@@ -29,15 +29,15 @@ class VisitorRenameFileOrFolderController extends Controller
RenameItemRequest $request,
string $id,
Share $shared,
): Response | array {
): JsonResponse {
// Return fake renamed item in demo
if (isDemoAccount()) {
return ($this->fakeRenameFileOrFolder)($request, $id);
return response()->json(($this->fakeRenameFileOrFolder)($request, $id));
}
// Check shared permission
if (is_visitor($shared)) {
abort(403);
return response()->json(accessDeniedError(), 403);
}
// Get file|folder item
@@ -64,10 +64,10 @@ class VisitorRenameFileOrFolderController extends Controller
}
if ($request->input('type') === 'folder') {
return response(new FolderResource($item), 201);
return response()->json(new FolderResource($item), 201);
}
// Return updated item
return response(new FileResource($item), 201);
return response()->json(new FileResource($item), 201);
}
}

7
src/Domain/Pages/Controllers/PagesController.php → src/Domain/Pages/Controllers/ShowPageController.php
View File

@@ -2,16 +2,17 @@
namespace Domain\Pages\Controllers;
use Domain\Pages\Models\Page;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use Domain\Pages\Resources\PageResource;
class PagesController extends Controller
class ShowPageController extends Controller
{
/**
* Get single page content
*/
public function show(Page $page): PageResource
public function __invoke(Page $page): JsonResponse
{
return new PageResource($page);
return response()->json(new PageResource($page));
}
}

13
src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php
View File

@@ -18,8 +18,10 @@ class VisitorRemoteUploadFileController extends Controller
) {
}
public function __invoke(RemoteUploadRequest $request, ?Share $shared = null): JsonResponse
{
public function __invoke(
RemoteUploadRequest $request,
?Share $shared = null,
): JsonResponse {
$successMessage = [
'type' => 'success',
'message' => 'Files was successfully uploaded.',
@@ -30,7 +32,12 @@ class VisitorRemoteUploadFileController extends Controller
// Check shared permission
if (is_visitor($shared)) {
abort(403, "You don't have access to this item");
return response()->json(accessDeniedError(), 403);
}
// Add default parent id if missing
if ($request->missing('parent_id')) {
$request->merge(['parent_id' => $shared->item_id]);
}
// Check access to requested directory

19
src/Domain/Sharing/Actions/ProtectShareRecordAction.php
View File

@@ -5,14 +5,19 @@ use Domain\Sharing\Models\Share;
class ProtectShareRecordAction
{
private string $message = "Sorry, you don't have permission";
public function __invoke(
Share $shared
): void {
if ($shared->is_protected) {
$errorResponse = [
'type' => 'error',
'message' => "Sorry, you don't have permission",
];
if (! request()->hasCookie('share_session')) {
abort(403, $this->message);
abort(
response()->json($errorResponse, 403)
);
}
// Get shared session
@@ -22,12 +27,16 @@ class ProtectShareRecordAction
// Check if is requested same share record
if ($share_session->token !== $shared->token) {
abort(403, $this->message);
abort(
response()->json($errorResponse, 403)
);
}
// Check if share record was authenticated previously via ShareController@authenticate
if (! $share_session->authenticated) {
abort(403, $this->message);
abort(
response()->json($errorResponse, 403)
);
}
}
}

4
src/Domain/Sharing/Controllers/ShareController.php
View File

@@ -17,8 +17,8 @@ class ShareController extends Controller
*/
public function show(
Share $share,
): ShareResource {
return new ShareResource($share);
): JsonResponse {
return response()->json(new ShareResource($share));
}
/**

4
src/Domain/Sharing/Controllers/WebCrawlerOpenGraphController.php
View File

@@ -4,8 +4,6 @@ namespace Domain\Sharing\Controllers;
use Domain\Sharing\Models\Share;
use Illuminate\Contracts\View\View;
use App\Http\Controllers\Controller;
use Illuminate\Contracts\View\Factory;
use Illuminate\Contracts\Foundation\Application;
class WebCrawlerOpenGraphController extends Controller
{
@@ -14,7 +12,7 @@ class WebCrawlerOpenGraphController extends Controller
*/
public function __invoke(
Share $share
): Application|Factory|View {
): View {
$namespace = match ($share->type) {
'folder' => 'Domain\\Folders\\Models\\Folder',
'file' => 'Domain\\Files\\Models\\File',

8
tests/Domain/Homepage/HomepageTest.php
View File

@@ -69,7 +69,7 @@ class HomepageTest extends TestCase
]);
$this
->get("/api/og-site/$share->token")
->get("/api/sharing/og-site/$share->token")
->assertStatus(200)
->assertSee('Folder Title');
}
@@ -100,7 +100,7 @@ class HomepageTest extends TestCase
]);
$this
->get("/api/og-site/$share->token")
->get("/api/sharing/og-site/$share->token")
->assertStatus(200)
->assertSee('Fake Image')
->assertSee('lg-fake-image.jpg');
@@ -132,7 +132,7 @@ class HomepageTest extends TestCase
]);
$this
->get("/api/og-site/$share->token")
->get("/api/sharing/og-site/$share->token")
->assertStatus(200)
->assertSee('This link is protected by password');
}
@@ -153,7 +153,7 @@ class HomepageTest extends TestCase
'email' => 'john@doe.com',
'message' => 'Whaats is up!',
])
->assertStatus(201);
->assertStatus(200);
Mail::assertSent(SendContactMessage::class);
}

2
tests/Domain/Sharing/VisitorAccessToItemsTest.php
View File

@@ -138,7 +138,7 @@ class VisitorAccessToItemsTest extends TestCase
]);
// Get share record
$this->get("/api/browse/file/$share->token")
$this->get("/api/sharing/file/$share->token")
->assertStatus(403);
}

20
tests/Domain/Sharing/VisitorBrowseTest.php
View File

@@ -93,7 +93,7 @@ class VisitorBrowseTest extends TestCase
'password' => bcrypt('secret'),
]);
$this->postJson("/api/browse/authenticate/$share->token", [
$this->postJson("/api/sharing/authenticate/$share->token", [
'password' => 'secret',
])
->assertStatus(200)
@@ -120,7 +120,7 @@ class VisitorBrowseTest extends TestCase
'password' => bcrypt('secret'),
]);
$this->postJson("/api/browse/authenticate/$share->token", [
$this->postJson("/api/sharing/authenticate/$share->token", [
'password' => 'bad-password',
])
->assertStatus(401)
@@ -298,14 +298,14 @@ class VisitorBrowseTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->get("/api/browse/navigation/$share->token")
->get("/api/sharing/navigation/$share->token")
->assertStatus(200)
->assertExactJson($tree);
}
// Check public shared item
if (! $is_protected) {
$this->getJson("/api/browse/navigation/$share->token")
$this->getJson("/api/sharing/navigation/$share->token")
->assertStatus(200)
->assertExactJson($tree);
}
@@ -348,7 +348,7 @@ class VisitorBrowseTest extends TestCase
])];
$this->withUnencryptedCookies($cookie)
->get("/api/search/$share->token?query=doc")
->get("/api/sharing/search/$share->token?query=doc")
->assertStatus(200)
->assertJsonFragment([
'id' => $file->id,
@@ -357,7 +357,7 @@ class VisitorBrowseTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->getJson("/api/search/$share->token?query=doc")
$this->getJson("/api/sharing/search/$share->token?query=doc")
->assertStatus(200)
->assertJsonFragment([
'id' => $file->id,
@@ -401,14 +401,14 @@ class VisitorBrowseTest extends TestCase
])];
$this->withUnencryptedCookies($cookie)
->get("/api/search/$share->token?query=doc")
->get("/api/sharing/search/$share->token?query=doc")
->assertStatus(200)
->assertJsonFragment([]);
}
// Check public shared item
if (! $is_protected) {
$this->getJson("/api/search/$share->token?query=doc")
$this->getJson("/api/sharing/search/$share->token?query=doc")
->assertStatus(200)
->assertJsonFragment([]);
}
@@ -446,7 +446,7 @@ class VisitorBrowseTest extends TestCase
])];
$this->withUnencryptedCookies($cookie)
->get("/api/browse/file/$share->token")
->get("/api/sharing/file/$share->token")
->assertStatus(200)
->assertJsonFragment([
'name' => 'Document',
@@ -455,7 +455,7 @@ class VisitorBrowseTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->getJson("/api/browse/file/$share->token")
$this->getJson("/api/sharing/file/$share->token")
->assertStatus(200)
->assertJsonFragment([
'name' => 'Document',

36
tests/Domain/Sharing/VisitorManipulatingTest.php
View File

@@ -52,7 +52,7 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->patch("/api/editor/rename/{$file->id}/$share->token", [
->patch("/api/sharing/rename/{$file->id}/$share->token", [
'name' => 'Renamed Item',
'type' => 'file',
])
@@ -64,7 +64,7 @@ class VisitorManipulatingTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->patchJson("/api/editor/rename/{$file->id}/$share->token", [
$this->patchJson("/api/sharing/rename/{$file->id}/$share->token", [
'name' => 'Renamed Item',
'type' => 'file',
])
@@ -122,7 +122,7 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->patch("/api/editor/rename/{$children->id}/$share->token", [
->patch("/api/sharing/rename/{$children->id}/$share->token", [
'name' => 'Renamed Folder',
'type' => 'folder',
])
@@ -134,7 +134,7 @@ class VisitorManipulatingTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->patchJson("/api/editor/rename/{$children->id}/$share->token", [
$this->patchJson("/api/sharing/rename/{$children->id}/$share->token", [
'name' => 'Renamed Folder',
'type' => 'folder',
])
@@ -186,7 +186,7 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->post("/api/editor/create-folder/$share->token", [
->post("/api/sharing/create-folder/$share->token", [
'name' => 'Awesome New Folder',
'parent_id' => $folder->id,
])
@@ -198,7 +198,7 @@ class VisitorManipulatingTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->postJson("/api/editor/create-folder/$share->token", [
$this->postJson("/api/sharing/create-folder/$share->token", [
'name' => 'Awesome New Folder',
'parent_id' => $folder->id,
])
@@ -272,13 +272,13 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->post("/api/editor/remove/$share->token", $payload)
->post("/api/sharing/remove/$share->token", $payload)
->assertStatus(204);
}
// Check public shared item
if (! $is_protected) {
$this->postJson("/api/editor/remove/$share->token", $payload)
$this->postJson("/api/sharing/remove/$share->token", $payload)
->assertStatus(204);
}
@@ -329,7 +329,7 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->post("/api/editor/upload/chunks/$share->token", [
->post("/api/sharing/upload/chunks/$share->token", [
'name' => $file->name,
'extension' => 'pdf',
'chunk' => $file,
@@ -340,7 +340,7 @@ class VisitorManipulatingTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->postJson("/api/editor/upload/chunks/$share->token", [
$this->postJson("/api/sharing/upload/chunks/$share->token", [
'name' => $file->name,
'extension' => 'pdf',
'chunk' => $file,
@@ -414,14 +414,14 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->post("/api/editor/move/$share->token", $payload)
->assertStatus(204);
->post("/api/sharing/move/$share->token", $payload)
->assertStatus(200);
}
// Check public shared item
if (! $is_protected) {
$this->postJson("/api/editor/move/$share->token", $payload)
->assertStatus(204);
$this->postJson("/api/sharing/move/$share->token", $payload)
->assertStatus(200);
}
$this->assertDatabaseHas('files', [
@@ -487,14 +487,14 @@ class VisitorManipulatingTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->post("/api/editor/move/$share->token", $payload)
->assertStatus(204);
->post("/api/sharing/move/$share->token", $payload)
->assertStatus(200);
}
// Check public shared item
if (! $is_protected) {
$this->postJson("/api/editor/move/$share->token", $payload)
->assertStatus(204);
$this->postJson("/api/sharing/move/$share->token", $payload)
->assertStatus(200);
}
$this->assertDatabaseHas('folders', [

2
tests/Domain/Traffic/TrafficTest.php
View File

@@ -113,7 +113,7 @@ class TrafficTest extends TestCase
]);
// Check public shared item
$this->postJson("/api/editor/upload/chunks/$share->token", [
$this->postJson("/api/sharing/upload/chunks/$share->token", [
'name' => $this->file->name,
'chunk' => $this->file,
'parent_id' => $folder->id,

4
tests/Support/Gate/GateTest.php
View File

@@ -81,7 +81,7 @@ class GateTest extends TestCase
$this
->withUnencryptedCookies($cookie)
->patch("/api/editor/rename/{$children->id}/$share->token", [
->patch("/api/sharing/rename/{$children->id}/$share->token", [
'name' => 'Renamed Folder',
'type' => 'folder',
])
@@ -93,7 +93,7 @@ class GateTest extends TestCase
// Check public shared item
if (! $is_protected) {
$this->patchJson("/api/editor/rename/{$children->id}/$share->token", [
$this->patchJson("/api/sharing/rename/{$children->id}/$share->token", [
'name' => 'Renamed Folder',
'type' => 'folder',
])