controller refactoring part 2

public/mix-manifest.json

@@ -55,7 +55,7 @@
     "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=dbc08f8cdc23900ef40a",
     "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=8c4b655b9286e06894c5",
     "/chunks/plans.js": "/chunks/plans.js?id=2b26173a02ed9f86e875",
-    "/chunks/platform.js": "/chunks/platform.js?id=377133abe0c9b3471bda",
+    "/chunks/platform.js": "/chunks/platform.js?id=b7b13093369e09fcb1cb",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=be3d7cf51585313cf53b",
     "/chunks/profile.js": "/chunks/profile.js?id=41b536880e846017d2d0",
     "/chunks/profile~chunks/settings-password.js": "/chunks/profile~chunks/settings-password.js?id=fd25990d1ccec0294602",
@@ -271,5 +271,8 @@
     "/chunks/settings.cd58b80e4d16e8317220.hot-update.js": "/chunks/settings.cd58b80e4d16e8317220.hot-update.js",
     "/chunks/settings-password.cd58b80e4d16e8317220.hot-update.js": "/chunks/settings-password.cd58b80e4d16e8317220.hot-update.js",
     "/chunks/upgrade-billing.57be1b9a66de806ff391.hot-update.js": "/chunks/upgrade-billing.57be1b9a66de806ff391.hot-update.js",
-    "/chunks/upgrade-billing.8805b4393b5aceb393ab.hot-update.js": "/chunks/upgrade-billing.8805b4393b5aceb393ab.hot-update.js"
+    "/chunks/upgrade-billing.8805b4393b5aceb393ab.hot-update.js": "/chunks/upgrade-billing.8805b4393b5aceb393ab.hot-update.js",
+    "/chunks/platform.13a7c4eb981e304dd11c.hot-update.js": "/chunks/platform.13a7c4eb981e304dd11c.hot-update.js",
+    "/chunks/platform.1dc9a86f8f195ad336c8.hot-update.js": "/chunks/platform.1dc9a86f8f195ad336c8.hot-update.js",
+    "/chunks/platform.c72b7ed144ae27e09ac0.hot-update.js": "/chunks/platform.c72b7ed144ae27e09ac0.hot-update.js"
 }

resources/js/components/Others/ShareCreatePopup.vue

@@ -196,9 +196,7 @@ export default {
 
             // Send request to get share link
             axios
-                .post(`/api/share/${this.shareOptions.id}`,
+                .post(`/api/share`, this.shareOptions)
-                    this.shareOptions
-                )
                 .then(response => {
 
                     // Show infobox and reset emails container

resources/js/components/Others/ShareEditPopup.vue

@@ -284,7 +284,7 @@
 
                 // Send request to get share link
                 axios
-                    .post('/api/share/' + this.shareOptions.token, {
+                    .post('/api/share/' + this.shareOptions.id, {
                         permission: this.shareOptions.permission,
                         protected: this.shareOptions.isProtected,
                         expiration: this.shareOptions.expiration,
@@ -324,6 +324,7 @@
 
                 // Store shared options
                 this.shareOptions = {
+                    id: args.item.shared.id,
                     token: args.item.shared.token,
                     expiration: args.item.shared.expire_in,
                     isProtected: args.item.shared.is_protected,

routes/api.php

@@ -1,21 +1,22 @@
 <?php
 
 use App\Users\Actions\CreateNewUserAction;
-use Domain\Browsing\Controllers\BrowseFolderContentController;
-use Domain\Browsing\Controllers\BrowseLatestFilesController;
-use Domain\Browsing\Controllers\BrowseParticipantsUploadsController;
-use Domain\Browsing\Controllers\BrowseSharedItemsController;
-use Domain\Browsing\Controllers\BrowseTrashContentController;
-use Domain\Browsing\Controllers\SearchFilesAndFoldersController;
-use Domain\Folders\Controllers\NavigationFolderTreeController;
-use Domain\Trash\Controllers\TrashController;
 use Domain\Sharing\Controllers\ShareController;
-use Domain\Browsing\Controllers\BrowseController;
 use Domain\Items\Controllers\EditItemsController;
+use Domain\Trash\Controllers\DumpTrashController;
 use App\Users\Controllers\ResetPasswordController;
 use App\Users\Controllers\ForgotPasswordController;
 use Domain\Folders\Controllers\FavouriteController;
 use Domain\Homepage\Controllers\AppFunctionsController;
+use Domain\Sharing\Controllers\ShareViaEmailController;
+use Domain\Trash\Controllers\RestoreTrashContentController;
+use Domain\Browsing\Controllers\BrowseLatestFilesController;
+use Domain\Browsing\Controllers\BrowseSharedItemsController;
+use Domain\Browsing\Controllers\BrowseTrashContentController;
+use Domain\Browsing\Controllers\BrowseFolderContentController;
+use Domain\Folders\Controllers\NavigationFolderTreeController;
+use Domain\Browsing\Controllers\SearchFilesAndFoldersController;
+use Domain\Browsing\Controllers\BrowseParticipantsUploadsController;
 
 // Pages
 Route::get('/content', [AppFunctionsController::class, 'get_setting_columns']);
@@ -37,33 +38,26 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     // Browse
     Route::group(['prefix' => 'browse'], function () {
         Route::get('/participants', BrowseParticipantsUploadsController::class);
-        Route::get('/navigation', NavigationFolderTreeController::class);
         Route::get('/folders/{id}', BrowseFolderContentController::class);
-        Route::get('/share', BrowseSharedItemsController::class);
+        Route::get('/navigation', NavigationFolderTreeController::class);
-        Route::get('/latest', BrowseLatestFilesController::class);
         Route::get('/search', SearchFilesAndFoldersController::class);
+        Route::get('/latest', BrowseLatestFilesController::class);
         Route::get('/trash', BrowseTrashContentController::class);
+        Route::get('/share', BrowseSharedItemsController::class);
     });
 
     // Trash
     Route::group(['prefix' => 'trash'], function () {
-        Route::post('/restore', [TrashController::class, 'restore']);
+        Route::post('/restore', RestoreTrashContentController::class);
-        Route::delete('/dump', [TrashController::class, 'dump']);
+        Route::delete('/dump', DumpTrashController::class);
     });
 
     // Favourites
-    Route::group(['prefix' => 'folders'], function () {
+    Route::apiResource('/folders/favourites', FavouriteController::class);
-        Route::delete('/favourites/{id}', [FavouriteController::class, 'destroy']);
-        Route::post('/favourites', [FavouriteController::class, 'store']);
-    });
 
     // Share
-    Route::group(['prefix' => 'share'], function () {
+    Route::post('/share/{token}/email', ShareViaEmailController::class);
-        Route::post('/{token}/email', [ShareController::class, 'send_to_emails_recipients']);
+    Route::apiResource('/share', ShareController::class);
-        Route::delete('/revoke', [ShareController::class, 'destroy']);
-        Route::patch('/{token}', [ShareController::class, 'update']);
-        Route::post('/{id}', [ShareController::class, 'store']);
-    });
 });
 
 // User master,editor routes

src/Domain/Browsing/Controllers/BrowseLatestFilesController.php

@@ -10,7 +10,7 @@ class BrowseLatestFilesController
     public function __invoke(): Collection
     {
         $user = User::with([
-            'latestUploads' => fn ($query) => $query->sortable(['created_at' => 'desc'])
+            'latestUploads' => fn ($query) => $query->sortable(['created_at' => 'desc']),
         ])
             ->where('id', Auth::id())
             ->first();

src/Domain/Folders/Controllers/FavouriteController.php

@@ -2,15 +2,13 @@
 namespace Domain\Folders\Controllers;
 
 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
 {
-    /**
-     * FavouriteController constructor.
-     */
     public function __construct(
         public DemoService $demo,
     ) {
@@ -18,19 +16,14 @@ class FavouriteController extends Controller
 
     /**
      * Add folder to user favourites
-     *
+     * todo: pridat validator ako AddToFavouritesRequest
-     * @param Request $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function store(Request $request)
+    public function store(Request $request): Response
     {
-        // todo: pridat validator ako AddToFavouritesRequest
+        $user = Auth::user();
 
-        foreach ($request->folders as $id) {
+        foreach ($request->input('folders') as $id) {
-            // Get user & folder
+            if (is_demo_account($user->email)) {
-            $user = Auth::user();
-
-            if (is_demo($user->id)) {
                 return $this->demo->favourites($user);
             }
 
@@ -46,21 +39,19 @@ class FavouriteController extends Controller
 
     /**
      * Remove folder from user favourites
-     *
-     * @param $id
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy(string $id): Response
     {
-        // Get user
         $user = Auth::user();
 
-        if (is_demo($user->id)) {
+        if (is_demo_account($user->email)) {
             return $this->demo->favourites($user);
         }
 
         // Remove folder from user favourites
-        $user->favouriteFolders()->detach($id);
+        $user
+            ->favouriteFolders()
+            ->detach($id);
 
         // Return updated favourites
         return response($user->favouriteFolders, 204);

src/Domain/Sharing/Actions/SendLinkToEmailAction.php

@@ -0,0 +1,20 @@
+<?php
+namespace Domain\Sharing\Actions;
+
+use Illuminate\Support\Facades\Notification;
+use Domain\Sharing\Notifications\SharedSendViaEmail;
+
+class SendLinkToEmailAction
+{
+    public function __invoke(
+        array $emails,
+        string $token,
+    ): void {
+        foreach ($emails as $email) {
+            Notification::route('mail', $email)
+                ->notify(
+                    new SharedSendViaEmail($token)
+                );
+        }
+    }
+}

src/Domain/Sharing/Controllers/ShareController.php

@@ -1,61 +1,54 @@
 <?php
 namespace Domain\Sharing\Controllers;
 
-use Validator;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Domain\Zipping\Models\Zip;
 use Domain\Sharing\Models\Share;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Domain\Sharing\Resources\ShareResource;
-use Illuminate\Support\Facades\Notification;
 use Domain\Sharing\Requests\CreateShareRequest;
 use Domain\Sharing\Requests\UpdateShareRequest;
-use Illuminate\Contracts\Routing\ResponseFactory;
+use Domain\Sharing\Actions\SendLinkToEmailAction;
-use Domain\Sharing\Notifications\SharedSendViaEmail;
 
 class ShareController extends Controller
 {
     /**
      * Get shared record
-     *
-     * @param Share $shared
-     * @return ShareResource
      */
-    public function show(Share $shared)
+    public function show(
-    {
+        Share $shared,
-        return new ShareResource(
+    ): ShareResource {
-            $shared
+        return new ShareResource($shared);
-        );
     }
 
     /**
      * Generate file share link
-     *
-     * @param CreateShareRequest $request
-     * @param $id
-     * @return ShareResource
      */
-    public function store(CreateShareRequest $request, $id)
+    public function store(
-    {
+        CreateShareRequest $request,
-        // Create shared options
+        SendLinkToEmailAction $sendLinkToEmailAction,
+    ): ShareResource {
+
         $shared = Share::create([
-            'password'     => $request->has('password') ? bcrypt($request->password) : null,
+            'password'     => $request->has('password')
-            'type'         => $request->type === 'folder' ? 'folder' : 'file',
+                ? bcrypt($request->input('password'))
-            'is_protected' => $request->isPassword,
+                : null,
-            'permission'   => $request->permission ?? null,
+            'type'         => $request->input('type') === 'folder' ? 'folder' : 'file',
-            'item_id'      => $id,
+            'is_protected' => $request->input('isPassword'),
-            'expire_in'    => $request->expiration ?? null,
+            'permission'   => $request->input('permission') ?? null,
+            'expire_in'    => $request->input('expiration') ?? null,
+            'item_id'      => $request->input('id'),
             'user_id'      => Auth::id(),
         ]);
 
         // Send shared link via email
         if ($request->has('emails')) {
-            foreach ($request->emails as $email) {
+            ($sendLinkToEmailAction)(
-                Notification::route('mail', $email)->notify(
+                $request->input('emails'),
-                    new SharedSendViaEmail($shared->token)
+                $shared->token
-                );
+            );
-            }
         }
 
         // Return created shared record
@@ -64,24 +57,24 @@ class ShareController extends Controller
 
     /**
      * Update sharing
-     *
-     * @param UpdateShareRequest $request
-     * @param $token
-     * @return ShareResource
      */
-    public function update(UpdateShareRequest $request, $token)
+    public function update(
-    {
+        UpdateShareRequest $request,
+        string $id,
+    ): ShareResource {
         // Get sharing record
-        $shared = Share::where('token', $token)
+        $shared = Share::where('id', $id)
             ->where('user_id', Auth::id())
             ->firstOrFail();
 
         // Update sharing record
         $shared->update([
-            'permission'   => $request->permission,
+            'permission'   => $request->input('permission'),
-            'is_protected' => $request->protected,
+            'is_protected' => $request->input('protected'),
-            'expire_in'    => $request->expiration,
+            'expire_in'    => $request->input('expiration'),
-            'password'     => $request->password ? bcrypt($request->password) : $shared->password,
+            'password'     => $request->input('password')
+                ? bcrypt($request->input('password'))
+                : $shared->password,
         ]);
 
         // Return shared record
@@ -90,20 +83,18 @@ class ShareController extends Controller
 
     /**
      * Delete sharing item
-     *
-     * @param Request $request
-     * @return ResponseFactory|\Illuminate\Http\Response
      */
-    public function destroy(Request $request)
+    public function destroy(
-    {
+        Request $request,
-        foreach ($request->tokens as $token) {
+    ): Response {
-            // Get sharing record
+        foreach ($request->input('tokens') as $token) {
+            // Delete share record
             Share::where('token', $token)
                 ->where('user_id', Auth::id())
                 ->firstOrFail()
                 ->delete();
 
-            // Get zip record
+            // Get zip record if exist
             $zip = Zip::where('shared_token', $token)
                 ->where('user_id', Auth::id())
                 ->first();
@@ -115,34 +106,4 @@ class ShareController extends Controller
 
         return response('Done!', 204);
     }
-
-    /**
-     * Send shared link via email to recipients
-     *
-     * @param $token
-     * @param $request
-     */
-    public function send_to_emails_recipients(Request $request, $token)
-    {
-        // TODO: pridat validation request
-        // Make validation of array of emails
-        $validator = Validator::make($request->all(), [
-            'emails.*' => 'required|email',
-        ]);
-
-        // Return error
-        if ($validator->fails()) {
-            abort(400, 'Bad email input');
-        }
-
-        // Send shared link via email
-        if ($request->has('emails')) {
-            foreach ($request->emails as $email) {
-                Notification::route('mail', $email)
-                    ->notify(new SharedSendViaEmail($token));
-            }
-        }
-
-        return response('Done!', 204);
-    }
 }

src/Domain/Sharing/Controllers/ShareViaEmailController.php

@@ -0,0 +1,23 @@
+<?php
+namespace Domain\Sharing\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Response;
+use App\Http\Controllers\Controller;
+use Domain\Sharing\Actions\SendLinkToEmailAction;
+
+class ShareViaEmailController extends Controller
+{
+    public function __invoke(
+        SendLinkToEmailAction $sendLinkToEmailAction,
+        Request $request,
+        string $token,
+    ): Response {
+        ($sendLinkToEmailAction)(
+            $request->input('emails'),
+            $token
+        );
+
+        return response('Done!', 204);
+    }
+}

src/Domain/Sharing/Models/Share.php

@@ -10,6 +10,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 /**
  * @method static whereNotNull(string $string)
+ * @method static where(string $string, string $token)
  */
 class Share extends Model
 {

src/Domain/Trash/Controllers/DumpTrashController.php

@@ -0,0 +1,48 @@
+<?php
+namespace Domain\Trash\Controllers;
+
+use Domain\Files\Models\File;
+use Illuminate\Http\Response;
+use Domain\Folders\Models\Folder;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
+
+class DumpTrashController extends Controller
+{
+    public function __invoke(): Response
+    {
+        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done!');
+
+        $user_id = Auth::id();
+
+        // Get files and folders
+        $folders = Folder::onlyTrashed()
+            ->where('user_id', $user_id)
+            ->get();
+
+        $files = File::onlyTrashed()
+            ->where('user_id', $user_id)
+            ->get();
+
+        // Force delete folder
+        $folders->each->forceDelete();
+
+        // Force delete files
+        foreach ($files as $file) {
+            // Delete file
+            Storage::delete("/files/$user_id/{$file->basename}");
+
+            // Delete thumbnail if exist
+            if ($file->thumbnail) {
+                Storage::delete("/files/$user_id/{$file->getRawOriginal('thumbnail')}");
+            }
+
+            // Delete file permanently
+            $file->forceDelete();
+        }
+
+        // Return response
+        return response('Done!', 204);
+    }
+}

src/Domain/Trash/Controllers/RestoreTrashContentController.php

@@ -3,33 +3,19 @@ namespace Domain\Trash\Controllers;
 
 use Illuminate\Http\Request;
 use Domain\Files\Models\File;
+use Illuminate\Http\Response;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use Support\Demo\Actions\DemoService;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Validator;
-use Illuminate\Contracts\Routing\ResponseFactory;
 
-class TrashController extends Controller
+class RestoreTrashContentController extends Controller
 {
-    /**
+    public function __invoke(
-     * TrashController constructor.
+        Request $request
-     */
+    ): Response {
-    public function __construct(
+        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
-        public DemoService $demo,
-    ) {
-    }
 
-    /**
-     * Restore item from trash
-     *
-     * @param Request $request
-     * @return ResponseFactory|\Illuminate\Http\Response
-     */
-    public function restore(Request $request)
-    {
-        // Validate request
         // TODO: zrefaktorovat validator do requestu
         $validator = Validator::make($request->input('items'), [
             '*.type' => 'required|string',
@@ -44,8 +30,6 @@ class TrashController extends Controller
         // Get user id
         $user_id = Auth::id();
 
-        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
-
         foreach ($request->input('items') as $restore) {
             // Get folder
             if ($restore['type'] === 'folder') {
@@ -81,41 +65,4 @@ class TrashController extends Controller
         // Return response
         return response('Done!', 204);
     }
-
-    /**
-     * Empty user trash
-     *
-     * @return ResponseFactory|\Illuminate\Http\Response
-     */
-    public function dump()
-    {
-        // Get user id
-        $user_id = Auth::id();
-
-        abort_if(is_demo_account('howdy@hi5ve.digital'), 204, 'Done.');
-
-        // Get files and folders
-        $folders = Folder::onlyTrashed()->where('user_id', $user_id)->get();
-        $files = File::onlyTrashed()->where('user_id', $user_id)->get();
-
-        // Force delete folder
-        $folders->each->forceDelete();
-
-        // Force delete files
-        foreach ($files as $file) {
-            // Delete file
-            Storage::delete("/files/$user_id/{$file->basename}");
-
-            // Delete thumbnail if exist
-            if ($file->thumbnail) {
-                Storage::delete("/files/$user_id/{$file->getRawOriginal('thumbnail')}");
-            }
-
-            // Delete file permanently
-            $file->forceDelete();
-        }
-
-        // Return response
-        return response('Done!', 204);
-    }
 }

src/Domain/Zipping/Models/Zip.php

@@ -8,6 +8,9 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
+/**
+ * @method static where(string $string, mixed $token)
+ */
 class Zip extends Model
 {
     use HasFactory;

src/Support/helpers.php

@@ -226,10 +226,8 @@ if (! function_exists('get_version')) {
 if (! function_exists('is_demo')) {
     /**
      * Check if is demo
-     *
-     * @return bool
      */
-    function is_demo()
+    function is_demo(): bool
     {
         return config('vuefilemanager.is_demo');
     }

tests/Domain/Folders/FavouriteFolderTest.php

@@ -0,0 +1,60 @@
+<?php
+namespace Tests\Domain\Folders;
+
+use Tests\TestCase;
+use App\Users\Models\User;
+use Domain\Folders\Models\Folder;
+
+class FavouriteFolderTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function it_add_folder_to_favourites()
+    {
+        $folder = Folder::factory(Folder::class)
+            ->create();
+
+        $user = User::factory(User::class)
+            ->create();
+
+        $this
+            ->actingAs($user)
+            ->postJson('/api/folders/favourites', [
+                'folders' => [
+                    $folder->id,
+                ],
+            ])->assertStatus(204);
+
+        $this->assertDatabaseHas('favourite_folder', [
+            'user_id'   => $user->id,
+            'folder_id' => $folder->id,
+        ]);
+    }
+
+    /**
+     * @test
+     */
+    public function it_remove_folder_from_favourites()
+    {
+        $folder = Folder::factory(Folder::class)
+            ->create();
+
+        $user = User::factory(User::class)
+            ->create();
+
+        $user
+            ->favouriteFolders()
+            ->attach($folder->id);
+
+        $this
+            ->actingAs($user)
+            ->deleteJson("/api/folders/favourites/$folder->id")
+            ->assertStatus(204);
+
+        $this->assertDatabaseMissing('favourite_folder', [
+            'user_id'   => $user->id,
+            'folder_id' => $folder->id,
+        ]);
+    }
+}

tests/Domain/Folders/FolderTest.php

@@ -151,57 +151,6 @@ class FolderTest extends TestCase
         ]);
     }
 
-    /**
-     * @test
-     */
-    public function it_add_folder_to_favourites()
-    {
-        $folder = Folder::factory(Folder::class)
-            ->create();
-
-        $user = User::factory(User::class)
-            ->create();
-
-        $this
-            ->actingAs($user)
-            ->postJson('/api/folders/favourites', [
-                'folders' => [
-                    $folder->id,
-                ],
-            ])->assertStatus(204);
-
-        $this->assertDatabaseHas('favourite_folder', [
-            'user_id'   => $user->id,
-            'folder_id' => $folder->id,
-        ]);
-    }
-
-    /**
-     * @test
-     */
-    public function it_remove_folder_from_favourites()
-    {
-        $folder = Folder::factory(Folder::class)
-            ->create();
-
-        $user = User::factory(User::class)
-            ->create();
-
-        $user
-            ->favouriteFolders()
-            ->attach($folder->id);
-
-        $this
-            ->actingAs($user)
-            ->deleteJson("/api/folders/favourites/$folder->id")
-            ->assertStatus(204);
-
-        $this->assertDatabaseMissing('favourite_folder', [
-            'user_id'   => $user->id,
-            'folder_id' => $folder->id,
-        ]);
-    }
-
     /**
      * @test
      */

tests/Domain/Sharing/UserShareTest.php

@@ -24,10 +24,11 @@ class UserShareTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/share/$file->id", [
+            ->postJson('/api/share', [
                 'isPassword' => false,
                 'permission' => 'editor',
                 'type'       => 'file',
+                'id'         => $file->id,
             ])->assertStatus(201)->assertJsonFragment([
                 'item_id' => $file->id,
                 'type'    => 'file',
@@ -56,10 +57,11 @@ class UserShareTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/share/$folder->id", [
+            ->postJson('/api/share', [
                 'isPassword' => false,
                 'permission' => 'editor',
                 'type'       => 'folder',
+                'id'         => $folder->id,
             ])->assertStatus(201)->assertJsonFragment([
                 'item_id' => $folder->id,
                 'type'    => 'folder',
@@ -88,11 +90,12 @@ class UserShareTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/share/$folder->id", [
+            ->postJson('/api/share', [
                 'isPassword' => true,
                 'password'   => 'secret',
                 'permission' => 'editor',
                 'type'       => 'folder',
+                'id'         => $folder->id,
             ])
             ->assertStatus(201)
             ->assertJsonFragment([
@@ -126,10 +129,11 @@ class UserShareTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/share/$folder->id", [
+            ->postJson('/api/share', [
                 'isPassword' => false,
                 'permission' => 'editor',
                 'type'       => 'folder',
+                'id'         => $folder->id,
                 'expiration' => 12,
             ])
             ->assertStatus(201)
@@ -152,10 +156,11 @@ class UserShareTest extends TestCase
 
         $this
             ->actingAs($user)
-            ->postJson("/api/share/$folder->id", [
+            ->postJson('/api/share', [
                 'isPassword' => false,
                 'permission' => 'editor',
                 'type'       => 'folder',
+                'id'         => $folder->id,
                 'emails'     => [
                     'john@doe.com',
                     'jane@doe.com',
@@ -178,10 +183,11 @@ class UserShareTest extends TestCase
 
         Sanctum::actingAs($user);
 
-        $this->postJson("/api/share/$folder->id", [
+        $this->postJson('/api/share', [
             'isPassword' => false,
             'permission' => 'editor',
             'type'       => 'folder',
+            'id'         => $folder->id,
         ])->assertStatus(201);
 
         $this->postJson("/api/share/$folder->id/email", [
@@ -209,10 +215,11 @@ class UserShareTest extends TestCase
 
         Sanctum::actingAs($user);
 
-        $this->postJson("/api/share/$folder->id", [
+        $this->postJson('/api/share', [
             'isPassword' => false,
             'permission' => 'editor',
             'type'       => 'folder',
+            'id'         => $folder->id,
         ])->assertStatus(201);
 
         $this->deleteJson('/api/share/revoke', [

tests/TestCase.php

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