api refactoring part 2

.env.testing

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

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
     "/js/main.js": "/js/main.js",
-    "/chunks/request.js": "/chunks/request.js?id=f5c1db9739c4c1c0",
+    "/chunks/request.js": "/chunks/request.js?id=4f2f083839a7f102",
     "/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=2fba310a3f0823f9",
+    "/chunks/shared.js": "/chunks/shared.js?id=54c3bc26f2aab8d6",
     "/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/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=1eece624920f98df",
+    "/chunks/admin.js": "/chunks/admin.js?id=60aa9e8508a842a1",
     "/chunks/dashboard.js": "/chunks/dashboard.js?id=5ab55a12214433c8",
     "/chunks/invoices.js": "/chunks/invoices.js?id=799928609f57ca10",
     "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=a0c4f59d0ec4aee0",
@@ -57,12 +57,12 @@
     "/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=83d20f90399191b9",
+    "/chunks/settings.js": "/chunks/settings.js?id=2f6576332da7cad2",
     "/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=a21fc7e052c60acd",
+    "/chunks/billing.js": "/chunks/billing.js?id=dd217d680baafb84",
-    "/chunks/platform.js": "/chunks/platform.js?id=4c28a2760f5cd8ea",
+    "/chunks/platform.js": "/chunks/platform.js?id=220943bcb1e9f3ca",
     "/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",

resources/js/components/RemoteUpload/RemoteUploadPopup.vue

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

resources/js/components/Subscription/UserBillingAlerts.vue

@@ -152,7 +152,7 @@ export default {
             this.isSendingBillingAlert = true
 
             axios
-                .patch(`/api/subscriptions/billing-alerts/${this.user.data.relationships.alert.data.id}`, {
+                .put('/api/subscriptions/billing-alert', {
                     amount: this.billingAlertAmount,
                 })
                 .then(() => {
@@ -184,7 +184,7 @@ export default {
             this.isSendingBillingAlert = true
 
             axios
-                .post('/api/subscriptions/billing-alerts', {
+                .post('/api/subscriptions/billing-alert', {
                     amount: this.billingAlertAmount,
                 })
                 .then(() => {
@@ -222,7 +222,7 @@ export default {
         events.$on('action:confirmed', (data) => {
             if (data.operation === 'delete-billing-alert')
                 axios
-                    .delete(`/api/subscriptions/billing-alerts/${this.user.data.relationships.alert.data.id}`)
+                    .delete('/api/subscriptions/billing-alert')
                     .then(() => {
                         this.$store.dispatch('getAppData')
 

resources/js/components/UploadRequest/CreateUploadRequestPopup.vue

@@ -164,7 +164,7 @@ export default {
 
 			// Send request to get share link
 			axios
-				.post(`/api/upload-request`, this.form)
+				.post(`/api/file-request`, this.form)
 				.then((response) => {
 					this.generatedUploadRequest = response.data
 				})

resources/js/store/modules/fileBrowser.js

@@ -104,7 +104,7 @@ const actions = {
         return new Promise((resolve, reject) => {
             // Get route
             let route = {
-                RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/navigation`,
+                RequestUpload: `/api/file-request/${router.currentRoute.params.token}/navigation`,
                 Public: `/api/browse/navigation/${router.currentRoute.params.token}`,
             }[router.currentRoute.name] || '/api/browse/navigation'
 

resources/js/store/modules/fileFunctions.js

@@ -59,7 +59,7 @@ const actions = {
 
         // Get route
         let route = {
-            RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/move`,
+            RequestUpload: `/api/file-request/${router.currentRoute.params.token}/move`,
             Public: `/api/editor/move/${router.currentRoute.params.token}`,
         }[router.currentRoute.name] || '/api/move'
 
@@ -87,7 +87,7 @@ const actions = {
     createFolder: ({ commit, getters, dispatch }, folder) => {
         // Get route
         let route = {
-            RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/create-folder`,
+            RequestUpload: `/api/file-request/${router.currentRoute.params.token}/create-folder`,
             Public: `/api/editor/create-folder/${router.currentRoute.params.token}`,
         }[router.currentRoute.name] || '/api/create-folder'
 
@@ -126,7 +126,7 @@ const actions = {
 
         // Get route
         let route = {
-            RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/rename/${data.id}`,
+            RequestUpload: `/api/file-request/${router.currentRoute.params.token}/rename/${data.id}`,
             Public: `/api/editor/rename/${data.id}/${router.currentRoute.params.token}`,
         }[router.currentRoute.name] || `/api/rename/${data.id}`
 
@@ -149,7 +149,7 @@ const actions = {
         return new Promise((resolve, reject) => {
             // Get route
             let route = {
-                RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/upload/chunks`,
+                RequestUpload: `/api/file-request/${router.currentRoute.params.token}/upload/chunks`,
                 Public: `/api/editor/upload/chunks/${router.currentRoute.params.token}`,
             }[router.currentRoute.name] || '/api/upload/chunks'
 
@@ -319,7 +319,7 @@ const actions = {
 
         // Get route
         let route = {
-            RequestUpload: `/api/upload-request/${router.currentRoute.params.token}/remove`,
+            RequestUpload: `/api/file-request/${router.currentRoute.params.token}/remove`,
             Public: `/api/editor/remove/${router.currentRoute.params.token}`,
         }[router.currentRoute.name] || '/api/remove'
 

resources/js/store/modules/uploadRequest.js

@@ -13,7 +13,7 @@ const actions = {
 
         return new Promise((resolve, reject) => {
             axios
-                .get(`/api/upload-request/${router.currentRoute.params.token}/browse/${id || 'all'}${getters.sorting.URI}`)
+                .get(`/api/file-request/${router.currentRoute.params.token}/browse/${id || 'all'}${getters.sorting.URI}`)
                 .then((response) => {
                     let folders = response.data.folders.data
                     let files = response.data.files.data
@@ -37,7 +37,7 @@ const actions = {
     },
     getUploadRequestDetail: ({ commit }) => {
         return new Promise((resolve, reject) => {
-            axios.get(`/api/upload-request/${router.currentRoute.params.token}`)
+            axios.get(`/api/file-request/${router.currentRoute.params.token}`)
                 .then((response) => {
                     resolve(response)
 
@@ -56,7 +56,7 @@ const actions = {
     },
     closeUploadRequest: ({ commit }) => {
         axios
-            .delete(`/api/upload-request/${router.currentRoute.params.token}`)
+            .delete(`/api/file-request/${router.currentRoute.params.token}`)
             .then((response) => {
                 commit('LOADING_STATE', { loading: false, data: [] })
                 commit('SET_UPLOAD_REQUEST', response.data)

routes/api.php

@@ -1,6 +1,5 @@
 <?php
 
-use Domain\Settings\Controllers\GetConfigController;
 use Domain\Zip\Controllers\ZipController;
 use Domain\Pages\Controllers\PagesController;
 use Domain\Sharing\Controllers\ShareController;
@@ -10,6 +9,7 @@ use Domain\Files\Controllers\UploadFileController;
 use App\Users\Controllers\ForgotPasswordController;
 use Domain\Folders\Controllers\FavouriteController;
 use Domain\Sharing\Controllers\ShareItemController;
+use Domain\Settings\Controllers\GetConfigController;
 use Domain\SetupWizard\Controllers\PingAPIController;
 use Domain\Folders\Controllers\CreateFolderController;
 use Domain\Browsing\Controllers\BrowseFolderController;
@@ -33,6 +33,8 @@ use App\Users\Controllers\Authentication\RegisterUserController;
 use Domain\Notifications\Controllers\GetUserNotificationsController;
 use Domain\Notifications\Controllers\FlushUserNotificationsController;
 use Domain\Notifications\Controllers\MarkUserNotificationsAsReadController;
+use App\Users\Controllers\Authentication\DestroyActiveBearerTokenController;
+use App\Users\Controllers\Authentication\AuthenticateAndReturnBearerTokenController;
 
 // Ping Pong
 Route::get('/ping', PingAPIController::class);
@@ -45,8 +47,11 @@ Route::apiResource('/page', PagesController::class);
 Route::post('/contact', SendContactMessageController::class);
 Route::get('/settings', GetSettingsValueController::class);
 
-// Register user
+// Register/login user
 Route::post('/register', RegisterUserController::class);
+Route::post('/login', AuthenticateAndReturnBearerTokenController::class)
+    ->middleware('throttle:login');
+Route::post('/logout', DestroyActiveBearerTokenController::class);
 
 // Socialite
 Route::get('/socialite/{provider}/redirect', SocialiteRedirectController::class);

routes/file-request.php

@@ -8,6 +8,7 @@ use Domain\UploadRequest\Controllers\BrowseUploadRequestController;
 use Domain\UploadRequest\Controllers\CreateUploadRequestController;
 use Domain\UploadRequest\Controllers\MoveItemInUploadRequestController;
 use Domain\UploadRequest\Controllers\SetUploadRequestAsFilledController;
+use Domain\UploadRequest\Controllers\UploadFileForUploadRequestController;
 use Domain\UploadRequest\Controllers\GetFolderTreeForUploadRequestController;
 use Domain\UploadRequest\Controllers\UploadFileChunksForUploadRequestController;
 use Domain\RemoteUpload\Controllers\UploadFilesRemotelyForUploadRequestController;
@@ -22,6 +23,8 @@ Route::group(['middleware' => 'upload-request'], function () {
     // Edit
     Route::post('/{uploadRequest}/upload/remote', UploadFilesRemotelyForUploadRequestController::class);
     Route::post('/{uploadRequest}/upload/chunks', UploadFileChunksForUploadRequestController::class);
+    Route::post('/{uploadRequest}/upload', UploadFileForUploadRequestController::class);
+    Route::post('/{uploadRequest}/move', MoveItemInUploadRequestController::class);
 
     Route::patch('/{uploadRequest}/rename/{id}', RenameFileOrFolderController::class);
     Route::post('/{uploadRequest}/create-folder', CreateFolderController::class);
@@ -30,7 +33,6 @@ Route::group(['middleware' => 'upload-request'], function () {
     // Browsing
     Route::get('/{uploadRequest}/navigation', GetFolderTreeForUploadRequestController::class);
     Route::get('/{uploadRequest}/browse/{folder?}', BrowseUploadRequestController::class);
-    Route::post('/{uploadRequest}/move', MoveItemInUploadRequestController::class);
 });
 
 // User functionality

src/App/Providers/RouteServiceProvider.php

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

src/App/Users/Controllers/Authentication/AuthenticateAndReturnBearerTokenController.php

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

src/App/Users/Controllers/Authentication/DestroyActiveBearerTokenController.php

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

src/App/Users/Requests/LoginUserRequest.php

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

src/Domain/Homepage/Controllers/IndexController.php

@@ -1,14 +1,15 @@
 <?php
 namespace Domain\Homepage\Controllers;
 
-use Domain\Settings\Actions\GetConfigAction;
 use Illuminate\Contracts\View\View;
+use Domain\Settings\Actions\GetConfigAction;
 
 class IndexController
 {
     public function __construct(
         public GetConfigAction $getConfig,
-    ) {}
+    ) {
+    }
 
     /**
      * Show index page

src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php

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

src/Domain/Settings/Actions/GetConfigAction.php

@@ -1,21 +1,21 @@
 <?php
-
 namespace Domain\Settings\Actions;
 
 use DB;
-use Domain\Pages\Models\Page;
-use Domain\Settings\Controllers\GetServerStatusController;
-use Monolog\Handler\MissingExtensionException;
 use PDOException;
+use Domain\Pages\Models\Page;
+use Monolog\Handler\MissingExtensionException;
 use VueFileManager\Subscription\Domain\Plans\Models\Plan;
-use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
+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
     {
@@ -80,7 +80,6 @@ class GetConfigAction
             $uploadLimitFormatted = isset($settings->upload_limit)
                 ? toMegabytes($settings->upload_limit)
                 : null;
-
         } catch (MissingExtensionException $e) {
             $storageDefaultSpaceFormatted = '5GB';
             $uploadLimit = 'undefined';

src/Domain/Settings/Controllers/GetConfigController.php

@@ -1,17 +1,16 @@
 <?php
-
 namespace Domain\Settings\Controllers;
 
-use Domain\Settings\Actions\GetConfigAction;
-use App\Http\Controllers\Controller;
 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
     {

src/Domain/UploadRequest/Actions/CreateUploadRequestRootFolderAction.php

@@ -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',
+        ]);
+    }
+}

src/Domain/UploadRequest/Controllers/CreateFolderController.php

@@ -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))) {
+        if ($request->has('parent_id') && ! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
-            return response('Access Denied', 403);
+            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);
     }
 }

src/Domain/UploadRequest/Controllers/DeleteFileOrFolderController.php

@@ -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

src/Domain/UploadRequest/Controllers/MoveItemInUploadRequestController.php

@@ -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.',
+        ]);
     }
 }

src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php

@@ -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',
+        ]);
     }
 }

src/Domain/UploadRequest/Controllers/UploadFileChunksForUploadRequestController.php

@@ -1,7 +1,6 @@
 <?php
 namespace Domain\UploadRequest\Controllers;
 
-use DB;
 use Storage;
 use Illuminate\Support\Str;
 use Domain\Folders\Models\Folder;
@@ -11,12 +10,14 @@ 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 UploadFileChunksForUploadRequestController
 {
     public function __construct(
-        private ProcessFileAction $processFie,
+        public ProcessFileAction $processFie,
-        private StoreFileChunksAction $storeFileChunks,
+        public StoreFileChunksAction $storeFileChunks,
+        public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
     ) {
     }
 
@@ -30,7 +31,7 @@ class UploadFileChunksForUploadRequestController
 
         // Create folder if not exist
         if ($folder->doesntExist()) {
-            $this->createFolder($uploadRequest);
+            ($this->createUploadRequestRootFolder)($uploadRequest);
         }
 
         // Set default parent_id for uploaded file
@@ -61,28 +62,4 @@ class UploadFileChunksForUploadRequestController
             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',
-        ]);
-    }
 }

src/Domain/UploadRequest/Controllers/UploadFileForUploadRequestController.php

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

src/Domain/UploadRequest/Middleware/ProtectUploadRequestRoutes.php

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

tests/Domain/UploadRequest/UploadRequestBrowsingTest.php

@@ -47,7 +47,7 @@ class UploadRequestBrowsingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->getJson("/api/upload-request/$uploadRequest->id/navigation")
+            ->getJson("/api/file-request/$uploadRequest->id/navigation")
             ->assertStatus(200)
             ->assertExactJson([
                 [
@@ -115,7 +115,7 @@ class UploadRequestBrowsingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
+            ->getJson("/api/file-request/$uploadRequest->id/browse/$root->id")
             ->assertStatus(200)
             ->assertJsonFragment([
                 'id' => $root->id,
@@ -165,7 +165,7 @@ class UploadRequestBrowsingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->getJson("/api/upload-request/$uploadRequest->id/browse/$root->id")
+            ->getJson("/api/file-request/$uploadRequest->id/browse/$root->id")
             ->assertStatus(200)
             ->assertJsonFragment([
                 'id' => $root->id,

tests/Domain/UploadRequest/UploadRequestEditingTest.php

@@ -34,7 +34,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->patchJson("/api/upload-request/$uploadRequest->id/rename/$folder->id", [
+            ->patchJson("/api/file-request/$uploadRequest->id/rename/$folder->id", [
                 'name' => 'Renamed Folder',
                 'type' => 'folder',
             ])
@@ -71,7 +71,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->patchJson("/api/upload-request/$uploadRequest->id/rename/$file->id", [
+            ->patchJson("/api/file-request/$uploadRequest->id/rename/$file->id", [
                 'name' => 'Renamed File',
                 'type' => 'file',
             ])
@@ -102,7 +102,7 @@ class UploadRequestEditingTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/upload-request/$uploadRequest->id/create-folder", [
+            ->postJson("/api/file-request/$uploadRequest->id/create-folder", [
                 'name'      => 'New Folder',
                 'parent_id' => $uploadRequest->id,
             ])
@@ -162,7 +162,7 @@ class UploadRequestEditingTest extends TestCase
             });
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/remove", [
+            ->postJson("/api/file-request/$uploadRequest->id/remove", [
                 'items' => [
                     [
                         'id'           => $image->id,
@@ -170,7 +170,7 @@ class UploadRequestEditingTest extends TestCase
                         'force_delete' => true,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         // Assert primary file was deleted
         Storage::assertMissing("files/$user->id/fake-image.jpeg");
@@ -209,7 +209,7 @@ class UploadRequestEditingTest extends TestCase
         Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/remove", [
+            ->postJson("/api/file-request/$uploadRequest->id/remove", [
                 'items' => [
                     [
                         'id'           => $file->id,
@@ -217,7 +217,7 @@ class UploadRequestEditingTest extends TestCase
                         'force_delete' => true,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         // Assert primary file was deleted
         Storage::assertMissing("files/$user->id/fake-file.pdf");
@@ -264,7 +264,7 @@ class UploadRequestEditingTest extends TestCase
         Storage::putFileAs("files/$user->id", $fakeFile, $fakeFile->name);
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/remove", [
+            ->postJson("/api/file-request/$uploadRequest->id/remove", [
                 'items' => [
                     [
                         'id'           => $folder->id,
@@ -272,7 +272,7 @@ class UploadRequestEditingTest extends TestCase
                         'force_delete' => true,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         $this
             ->assertDatabaseMissing('folders', [
@@ -317,7 +317,7 @@ class UploadRequestEditingTest extends TestCase
             ]);
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/move", [
+            ->postJson("/api/file-request/$uploadRequest->id/move", [
                 'to_id' => $folder->id,
                 'items' => [
                     [
@@ -325,7 +325,7 @@ class UploadRequestEditingTest extends TestCase
                         'id'   => $file->id,
                     ],
                 ],
-            ])->assertStatus(204);
+            ])->assertStatus(200);
 
         $this->assertDatabaseHas('files', [
             'id'        => $file->id,

tests/Domain/UploadRequest/UploadRequestTest.php

@@ -42,7 +42,7 @@ class UploadRequestTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson('/api/upload-request', [
+            ->postJson('/api/file-request', [
                 'folder_id' => $folder->id,
                 'email'     => 'howdy@hi5ve.digital',
                 'notes'     => 'Please send me your files...',
@@ -74,7 +74,7 @@ class UploadRequestTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson('/api/upload-request', [
+            ->postJson('/api/file-request', [
                 'folder_id' => $folder->id,
                 'notes'     => 'Please send me your files...',
             ])
@@ -105,7 +105,7 @@ class UploadRequestTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson('/api/upload-request', [
+            ->postJson('/api/file-request', [
                 'folder_id' => $folder->id,
                 'notes'     => 'Please send me your files...',
                 'name'      => 'My name',
@@ -137,7 +137,7 @@ class UploadRequestTest extends TestCase
                 'user_id' => $user->id,
             ]);
 
-        $this->getJson("/api/upload-request/$uploadRequest->id")
+        $this->getJson("/api/file-request/$uploadRequest->id")
             ->assertOk()
             ->assertJsonFragment([
                 'id' => $uploadRequest->id,
@@ -165,7 +165,7 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload/chunks", [
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
                 'name'            => $file->name,
                 'extension'       => 'pdf',
                 'chunk'           => $file,
@@ -209,7 +209,7 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload/chunks", [
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
                 'name'            => $file->name,
                 'extension'       => 'pdf',
                 'chunk'           => $file,
@@ -252,7 +252,7 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload/chunks", [
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
                 'name'            => $file->name,
                 'file'            => $file,
                 'is_last_chunk'   => 1,
@@ -275,12 +275,8 @@ class UploadRequestTest extends TestCase
             ]);
 
         $this
-            ->deleteJson("/api/upload-request/$uploadRequest->id")
+            ->deleteJson("/api/file-request/$uploadRequest->id")
-            ->assertStatus(201)
+            ->assertStatus(200);
-            ->assertJsonFragment([
-                'id'     => $uploadRequest->id,
-                'status' => 'filled',
-            ]);
 
         Notification::assertSentTo($user, UploadRequestFulfilledNotification::class);
     }
@@ -323,7 +319,7 @@ class UploadRequestTest extends TestCase
             ->create('fake-file.pdf', 12000000, 'application/pdf');
 
         $this
-            ->postJson("/api/upload-request/$uploadRequest->id/upload/chunks", [
+            ->postJson("/api/file-request/$uploadRequest->id/upload/chunks", [
                 'name'            => $file->name,
                 'extension'       => 'pdf',
                 'chunk'           => $file,