Merge pull request #57 from luka-lta/hotfix-permissions

hotfix: Permission to const

Author: luka-lta

data/mysql/01_permissions.sql

@@ -12,7 +12,11 @@ INSERT INTO `permissions` (`permission_id`, `permission_name`, `permission_descr
 VALUES (1, 'Create links', 'Create new links for LinkCollection'),
        (2, 'Delete Links', 'Delete links from LinkCollection'),
        (3, 'Edit Links', 'Edit Links from the LinkCollection'),
-       (4, 'Read Links', 'Get all links from the LinkCollection');
+       (4, 'Read Links', 'Get all links from the LinkCollection'),
+       (5, 'Read Clicks', 'Get all Clicks from the LinkCollection'),
+       (6, 'Create Api keys', 'Create new Api keys for Api access'),
+       (7, 'Read Api keys', 'Read Api keys'),
+       (8, 'Read Permissions', 'Read the permissions');
 
 ALTER TABLE `permissions`
     ADD PRIMARY KEY (`permission_id`),

src/Repository/ApiKeyRepository.php

@@ -149,20 +149,20 @@ public function getApiKeyByOrigin(KeyOrigin $origin): ?ApiKeyObject
         }
     }
 
-    public function hasPermission(KeyId $apiKeyId, string $permissionName): bool
+    public function hasPermission(KeyId $apiKeyId, int $permissionId): bool
     {
         $query = "
             SELECT COUNT(*) as count
             FROM api_key_permissions akp
             INNER JOIN permissions p ON akp.permission_id = p.permission_id
-            WHERE akp.api_key_id = :apiKeyId AND p.permission_name = :permissionName
+            WHERE akp.api_key_id = :apiKeyId AND p.permission_id = :permissionId
         ";
 
         try {
             $stmt = $this->pdo->prepare($query);
             $stmt->execute([
                 'apiKeyId' => $apiKeyId->asInt(),
-                'permissionName' => $permissionName,
+                'permissionId' => $permissionId,
             ]);
         } catch (PDOException) {
             throw new ApiDatabaseException(

src/Slim/RouteMiddlewareCollector.php

@@ -26,6 +26,7 @@
 use LukaLtaApi\Slim\Middleware\ApiKeyPermissionMiddleware;
 use LukaLtaApi\Slim\Middleware\AuthMiddleware;
 use LukaLtaApi\Slim\Middleware\CORSMiddleware;
+use LukaLtaApi\Value\Permission\Permission;
 use Monolog\Logger;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -108,12 +109,12 @@ public function registerApiRoutes(App $app): void
                 $key->post('/', CreateApiKeyAction::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Create API keys']
+                        [Permission::CREATE_API_KEYS]
                     ));
                 $key->get('/', GetAllApiKeysAction::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Read API keys']
+                        [Permission::READ_API_KEYS]
                     ));
             })->add(AuthMiddleware::class);
 
@@ -144,22 +145,22 @@ public function registerApiRoutes(App $app): void
                 $linkCollection->post('/', CreateLinkAction::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Create links']
+                        [Permission::CREATE_LINKS]
                     ));
                 $linkCollection->get('/', GetAllLinksAction::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Read links']
+                        [Permission::VIEW_LINKS]
                     ));
                 $linkCollection->get('/{linkId:[0-9]+}', GetDetailLink::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Read links']
+                        [Permission::VIEW_LINKS]
                     ));
                 $linkCollection->put('/{linkId:[0-9]+}', EditLinkAction::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Edit links']
+                        [Permission::EDIT_LINKS]
                     ));
                 $linkCollection->delete('/{linkId:[0-9]+}', DisableLinkAction::class);
             })->add(AuthMiddleware::class);
@@ -170,7 +171,7 @@ public function registerApiRoutes(App $app): void
                     ->add(AuthMiddleware::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Get clicks']
+                        [Permission::VIEW_CLICKS]
                     ));
             });
 
@@ -184,7 +185,7 @@ public function registerApiRoutes(App $app): void
                 $permissions->get('/', GetPermissionsAction::class)
                     ->add(new ApiKeyPermissionMiddleware(
                         $app->getContainer()?->get(PermissionService::class),
-                        ['Read permissions']
+                        [Permission::READ_PERMISSIONS]
                     ));
             })->add(AuthMiddleware::class);
         });

src/Value/Permission/Permission.php

@@ -6,6 +6,15 @@
 
 class Permission
 {
+    public const int CREATE_LINKS = 1;
+    public const int DELETE_LINKS = 2;
+    public const int EDIT_LINKS = 3;
+    public const int VIEW_LINKS = 4;
+    public const int VIEW_CLICKS = 5;
+    public const int CREATE_API_KEYS = 6;
+    public const int READ_API_KEYS = 7;
+    public const int READ_PERMISSIONS = 8;
+
     private function __construct(
         private readonly ?int $permissionId,
         private readonly string $name,