permissions refactoring

app/Http/Controllers/ProjectController.php

@@ -2,8 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Actions\ProjectPermissions\ProjectPermissionService;
+use App\Actions\Permissions\PermissionService;
 use App\Actions\ProjectTicketMetadata\InitializeProjectTicketMetadata;
+use App\Enums\Permission;
 use App\Http\Requests\DeleteProjectRequest;
 use App\Http\Requests\StoreProjectRequest;
 use App\Http\Requests\SyncProjectPermissionsRequest;
@@ -20,7 +21,7 @@ class ProjectController extends Controller
 {
     public function __construct(
         private readonly InitializeProjectTicketMetadata $initializeProjectTicketMetadata,
-        private readonly ProjectPermissionService $projectPermissionService,
+        private readonly PermissionService $permissionService,
     ) {}
 
     public function index(Request $request): Response
@@ -30,12 +31,13 @@ class ProjectController extends Controller
         $projectQuery = Project::query()
             ->orderByDesc('id');
 
-        if (! $user->is_admin) {
-            $viewableProjectIds = $this->projectPermissionService->viewableProjectIds($user);
+        if (! $this->permissionService->allows($user, Permission::GlobalAdmin)) {
+            $viewableProjectIds = $this->permissionService->viewableProjectIds($user);
 
             if ($viewableProjectIds === []) {
                 return Inertia::render('projects/Index', [
                     'projects' => [],
+                    'status' => session('status'),
                 ]);
             }
 
@@ -49,8 +51,13 @@ class ProjectController extends Controller
         ]);
     }
 
-    public function create(): Response
+    public function create(Request $request): Response
     {
+        abort_unless(
+            $this->permissionService->allows($request->user(), Permission::ProjectCreate),
+            403,
+        );
+
         return Inertia::render('projects/Create');
     }
 
@@ -58,7 +65,7 @@ class ProjectController extends Controller
     {
         $project = Project::query()->create($request->validated());
         $this->initializeProjectTicketMetadata->handle($project);
-        $this->projectPermissionService->grantAllProjectPermissions($project, $request->user());
+        $this->permissionService->grant($request->user(), Permission::ProjectAdmin, $project);
 
         return to_route('projects.show', $project);
     }
@@ -68,12 +75,12 @@ class ProjectController extends Controller
         $user = $request->user();
 
         abort_unless(
-            $this->projectPermissionService->userCanViewProject($user, $project),
+            $this->permissionService->allows($user, Permission::ProjectRead, $project),
             403,
         );
 
         return Inertia::render('projects/Show', [
-            'canManageAccess' => $this->projectPermissionService->userCanManageProjectAccess($user, $project),
+            'canManageAccess' => $this->permissionService->allows($user, Permission::ProjectAdmin, $project),
             'project' => $project,
         ]);
     }
@@ -90,16 +97,16 @@ class ProjectController extends Controller
     {
         $user = $request->user();
         abort_unless(
-            $this->projectPermissionService->userCanManageProjectAccess($user, $project),
+            $this->permissionService->allows($user, Permission::ProjectAdmin, $project),
             403,
         );
 
         return Inertia::render('projects/Access', [
-            'directPermissions' => $this->projectPermissionService->userPermissionMap($project),
-            'permissionOptions' => $this->projectPermissionService->permissionOptions(),
+            'directPermissions' => $this->permissionService->assignmentMap(User::class, $project),
+            'permissionOptions' => $this->permissionService->permissionOptions(User::class, Project::class),
             'project' => $project,
             'status' => session('status'),
-            'teamPermissions' => $this->projectPermissionService->teamPermissionMap($project),
+            'teamPermissions' => $this->permissionService->assignmentMap(Team::class, $project),
             'teams' => Team::query()
                 ->with('users')
                 ->orderBy('name')
@@ -125,14 +132,14 @@ class ProjectController extends Controller
     ): RedirectResponse {
 
         abort_unless(
-            $this->projectPermissionService->userCanManageProjectAccess($request->user(), $project),
+            $this->permissionService->allows($request->user(), Permission::ProjectAdmin, $project),
             403,
         );
 
         $validated = $request->validated();
         $permissions = Arr::get($validated, 'permissions', []);
 
-        $this->projectPermissionService->syncUserPermissions($project, $user, $permissions);
+        $this->permissionService->sync($user, $project, $permissions);
 
         return to_route('projects.access', $project)
             ->with('status', "{$user->name} permissions were updated.");
@@ -144,14 +151,14 @@ class ProjectController extends Controller
         Team $team,
     ): RedirectResponse {
         abort_unless(
-            $this->projectPermissionService->userCanManageProjectAccess($request->user(), $project),
+            $this->permissionService->allows($request->user(), Permission::ProjectAdmin, $project),
             403,
         );
 
         $validated = $request->validated();
         $permissions = Arr::get($validated, 'permissions', []);
 
-        $this->projectPermissionService->syncTeamPermissions($project, $team, $permissions);
+        $this->permissionService->sync($team, $project, $permissions);
 
         return to_route('projects.access', $project)
             ->with('status', "{$team->name} permissions were updated.");