Refactor api key permissions

app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php

@@ -11,6 +11,7 @@
 use Filament\Forms\Components\ToggleButtons;
 use Filament\Forms\Form;
 use Filament\Resources\Pages\CreateRecord;
+use Illuminate\Database\Eloquent\Model;
 
 class CreateApiKey extends CreateRecord
 {
@@ -41,7 +42,7 @@ public function form(Form $form): Form
                         'md' => 2,
                     ])
                     ->schema(
-                        collect(ApiKey::RESOURCES)->map(fn ($resource) => ToggleButtons::make("r_$resource")
+                        collect(ApiKey::getPermissionList())->map(fn ($resource) => ToggleButtons::make('permissions_' . $resource)
                             ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
@@ -87,4 +88,20 @@ public function form(Form $form): Form
                     ->columnSpanFull(),
             ]);
     }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        $permissions = [];
+
+        foreach (ApiKey::getPermissionList() as $permission) {
+            if (isset($data['permissions_' . $permission])) {
+                $permissions[$permission] = intval($data['permissions_' . $permission]);
+                unset($data['permissions_' . $permission]);
+            }
+        }
+
+        $data['permissions'] = $permissions;
+
+        return parent::handleRecordCreation($data);
+    }
 }

app/Http/Requests/Admin/Api/StoreApplicationApiKeyRequest.php

@@ -3,7 +3,6 @@
 namespace App\Http\Requests\Admin\Api;
 
 use App\Models\ApiKey;
-use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Admin\AdminFormRequest;
 
 class StoreApplicationApiKeyRequest extends AdminFormRequest
@@ -16,9 +15,12 @@ public function rules(): array
     {
         $modelRules = ApiKey::getRules();
 
-        return collect(AdminAcl::getResourceList())->mapWithKeys(function ($resource) use ($modelRules) {
-            return [AdminAcl::COLUMN_IDENTIFIER . $resource => $modelRules['r_' . $resource]];
-        })->merge(['memo' => $modelRules['memo']])->toArray();
+        $rules = [
+            'memo' => $modelRules['memo'],
+            'permissions' => $modelRules['permissions'],
+        ];
+
+        return $rules;
     }
 
     public function attributes(): array
@@ -30,8 +32,8 @@ public function attributes(): array
 
     public function getKeyPermissions(): array
     {
-        return collect($this->validated())->filter(function ($value, $key) {
-            return substr($key, 0, strlen(AdminAcl::COLUMN_IDENTIFIER)) === AdminAcl::COLUMN_IDENTIFIER;
-        })->toArray();
+        $data = $this->validated();
+
+        return array_keys($data['permissions']);
     }
 }

app/Http/Requests/Api/Application/Allocations/DeleteAllocationRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Allocation;
 
 class DeleteAllocationRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_ALLOCATIONS;
+    protected ?string $resource = Allocation::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/Allocations/GetAllocationsRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Allocation;
 
 class GetAllocationsRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_ALLOCATIONS;
+    protected ?string $resource = Allocation::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Allocations/StoreAllocationRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Allocation;
 
 class StoreAllocationRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_ALLOCATIONS;
+    protected ?string $resource = Allocation::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/DatabaseHosts/DeleteDatabaseHostRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\DatabaseHost;
 
 class DeleteDatabaseHostRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
+    protected ?string $resource = DatabaseHost::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/DatabaseHosts/GetDatabaseHostRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\DatabaseHost;
 
 class GetDatabaseHostRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
+    protected ?string $resource = DatabaseHost::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/DatabaseHosts/StoreDatabaseHostRequest.php

@@ -8,7 +8,7 @@
 
 class StoreDatabaseHostRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_DATABASE_HOSTS;
+    protected ?string $resource = DatabaseHost::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/Eggs/GetEggRequest.php

@@ -4,10 +4,11 @@
 
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
 use App\Services\Acl\Api\AdminAcl;
+use App\Models\Egg;
 
 class GetEggRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_EGGS;
+    protected ?string $resource = Egg::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Eggs/GetEggsRequest.php

@@ -4,10 +4,11 @@
 
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
 use App\Services\Acl\Api\AdminAcl;
+use App\Models\Egg;
 
 class GetEggsRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_EGGS;
+    protected ?string $resource = Egg::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Mounts/DeleteMountRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Mount;
 
 class DeleteMountRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_MOUNTS;
+    protected ?string $resource = Mount::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/Mounts/GetMountRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Mount;
 
 class GetMountRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_MOUNTS;
+    protected ?string $resource = Mount::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Mounts/StoreMountRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Mount;
 
 class StoreMountRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_MOUNTS;
+    protected ?string $resource = Mount::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/Nodes/DeleteNodeRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Node;
 
 class DeleteNodeRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_NODES;
+    protected ?string $resource = Node::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/Nodes/GetNodesRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Node;
 
 class GetNodesRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_NODES;
+    protected ?string $resource = Node::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Nodes/StoreNodeRequest.php

@@ -8,7 +8,7 @@
 
 class StoreNodeRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_NODES;
+    protected ?string $resource = Node::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/Roles/DeleteRoleRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Role;
 
 class DeleteRoleRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_ROLES;
+    protected ?string $resource = Role::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/Roles/GetRoleRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Role;
 
 class GetRoleRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_ROLES;
+    protected ?string $resource = Role::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Roles/StoreRoleRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Role;
 
 class StoreRoleRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_ROLES;
+    protected ?string $resource = Role::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/Servers/Databases/GetServerDatabaseRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Database;
 
 class GetServerDatabaseRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
+    protected ?string $resource = Database::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Servers/Databases/GetServerDatabasesRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Database;
 
 class GetServerDatabasesRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
+    protected ?string $resource = Database::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Servers/Databases/StoreServerDatabaseRequest.php

@@ -9,10 +9,11 @@
 use App\Services\Acl\Api\AdminAcl;
 use App\Services\Databases\DatabaseManagementService;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Database;
 
 class StoreServerDatabaseRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVER_DATABASES;
+    protected ?string $resource = Database::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/Servers/GetExternalServerRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Server;
 
 class GetExternalServerRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
+    protected ?string $resource = Server::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Servers/GetServerRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Server;
 
 class GetServerRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
+    protected ?string $resource = Server::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::READ;
 }

app/Http/Requests/Api/Application/Servers/ServerWriteRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\Server;
 
 class ServerWriteRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
+    protected ?string $resource = Server::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }

app/Http/Requests/Api/Application/Servers/StoreServerRequest.php

@@ -11,7 +11,7 @@
 
 class StoreServerRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
+    protected ?string $resource = Server::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/Servers/UpdateServerStartupRequest.php

@@ -8,7 +8,7 @@
 
 class UpdateServerStartupRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_SERVERS;
+    protected ?string $resource = Server::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 

app/Http/Requests/Api/Application/Users/DeleteUserRequest.php

@@ -4,10 +4,11 @@
 
 use App\Services\Acl\Api\AdminAcl;
 use App\Http\Requests\Api\Application\ApplicationApiRequest;
+use App\Models\User;
 
 class DeleteUserRequest extends ApplicationApiRequest
 {
-    protected ?string $resource = AdminAcl::RESOURCE_USERS;
+    protected ?string $resource = User::RESOURCE_NAME;
 
     protected int $permission = AdminAcl::WRITE;
 }