- Restrictions for team folders

src/Domain/Files/Actions/UploadFileAction.php

@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Files\Actions;
 
-use App\Users\Exceptions\InvalidUserActionException;
 use Illuminate\Support\Str;
 use Domain\Sharing\Models\Share;
 use Illuminate\Support\Facades\Auth;
@@ -10,6 +9,7 @@ use Illuminate\Support\Facades\Storage;
 use Domain\Files\Requests\UploadRequest;
 use Domain\Files\Models\File as UserFile;
 use Domain\Traffic\Actions\RecordUploadAction;
+use App\Users\Exceptions\InvalidUserActionException;
 
 class UploadFileAction
 {

src/Domain/Files/Controllers/UploadFileController.php

@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Files\Controllers;
 
-use App\Users\Exceptions\InvalidUserActionException;
 use Domain\Files\Models\File;
 use Illuminate\Http\Response;
 use App\Http\Controllers\Controller;
@@ -9,6 +8,7 @@ use Domain\Files\Requests\UploadRequest;
 use Domain\Files\Resources\FileResource;
 use Domain\Files\Actions\UploadFileAction;
 use Support\Demo\Actions\FakeUploadFileAction;
+use App\Users\Exceptions\InvalidUserActionException;
 
 class UploadFileController extends Controller
 {
@@ -29,6 +29,7 @@ class UploadFileController extends Controller
         }
 
         try {
+            // Upload and store file record
             $file = ($this->uploadFiles)($request);
 
             return response(new FileResource($file), 201);

src/Domain/Teams/Actions/CheckMaxTeamMembersLimitAction.php

@@ -5,7 +5,7 @@ use App\Users\Models\User;
 
 class CheckMaxTeamMembersLimitAction
 {
-    public function __invoke(array $invitations, User $user)
+    public function __invoke(User $user, array $newInvites): bool
     {
         // Get user limitation summary
         $limits = $user->limitations->summary();
@@ -14,7 +14,7 @@ class CheckMaxTeamMembersLimitAction
         $allowedEmails = $limits['max_team_members']['meta']['allowed_emails'];
 
         // Get new email invites from request
-        $invitationEmails = collect($invitations)
+        $invitationEmails = collect($newInvites)
             ->pluck('email');
 
         // Count total unique members
@@ -24,8 +24,6 @@ class CheckMaxTeamMembersLimitAction
             ->count();
 
         // Check if there is more unique members than total max team members are allowed
-        if ($totalMembers > $limits['max_team_members']['total']) {
-            abort(423, 'You exceed your members limit.');
-        }
+        return ! ($totalMembers > $limits['max_team_members']['total']);
     }
 }

src/Domain/Teams/Controllers/ConvertFolderIntoTeamFolderController.php

@@ -7,7 +7,6 @@ use App\Http\Controllers\Controller;
 use Domain\Teams\Models\TeamFolderMember;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Requests\ConvertIntoTeamFolderRequest;
-use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
 use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
 
@@ -15,7 +14,6 @@ class ConvertFolderIntoTeamFolderController extends Controller
 {
     public function __construct(
         public InviteMembersIntoTeamFolderAction $inviteMembers,
-        public CheckMaxTeamMembersLimitAction $checkMaxTeamMembersLimit,
         public SetTeamFolderPropertyForAllChildrenAction $setTeamFolderPropertyForAllChildren,
     ) {
     }
@@ -25,7 +23,12 @@ class ConvertFolderIntoTeamFolderController extends Controller
         Folder $folder
     ): ResponseFactory|Response {
         // Check if user didn't exceed max team members limit
-        ($this->checkMaxTeamMembersLimit)($request->input('invitations'), $folder->owner);
+        if (! $folder->owner->canInviteTeamMembers($request->input('invitations'))) {
+            return response([
+                'type'    => 'error',
+                'message' => 'You exceed your members limit.',
+            ], 401);
+        }
 
         // Update root team folder
         $folder->update([

src/Domain/Teams/Controllers/TeamFoldersController.php

@@ -17,7 +17,6 @@ use Domain\Folders\Resources\FolderCollection;
 use Domain\Teams\Actions\UpdateInvitationsAction;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Domain\Teams\Requests\CreateTeamFolderRequest;
-use Domain\Teams\Actions\CheckMaxTeamMembersLimitAction;
 use Domain\Teams\Requests\UpdateTeamFolderMembersRequest;
 use Domain\Teams\Actions\InviteMembersIntoTeamFolderAction;
 use Domain\Teams\Actions\SetTeamFolderPropertyForAllChildrenAction;
@@ -27,7 +26,6 @@ class TeamFoldersController extends Controller
     public function __construct(
         public InviteMembersIntoTeamFolderAction $inviteMembers,
         public SetTeamFolderPropertyForAllChildrenAction $setTeamFolderPropertyForAllChildren,
-        public CheckMaxTeamMembersLimitAction $checkMaxTeamMembersLimit,
     ) {
     }
 
@@ -61,8 +59,21 @@ class TeamFoldersController extends Controller
     ): ResponseFactory | Response {
         $data = CreateTeamFolderData::fromRequest($request);
 
+        // Check if user can create team folder
+        if (! $request->user()->canCreateTeamFolder()) {
+            return response([
+                'type'    => 'error',
+                'message' => 'This user action is not allowed.',
+            ], 401);
+        }
+
         // Check if user didn't exceed max team members limit
-        ($this->checkMaxTeamMembersLimit)($data->invitations, $request->user());
+        if (! $request->user()->canInviteTeamMembers($data->invitations)) {
+            return response([
+                'type'    => 'error',
+                'message' => 'You exceed your members limit.',
+            ], 401);
+        }
 
         // Create folder
         $folder = Folder::create([
@@ -93,7 +104,12 @@ class TeamFoldersController extends Controller
         $this->authorize('owner', $folder);
 
         // Check if user didn't exceed max team members limit
-        ($this->checkMaxTeamMembersLimit)($request->input('invitations'), $request->user());
+        if (! $request->user()->canInviteTeamMembers($request->input('invitations'))) {
+            return response([
+                'type'    => 'error',
+                'message' => 'You exceed your members limit.',
+            ], 401);
+        }
 
         $updateInvitations(
             $folder,