diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 02dc69d..bbbfd36 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -13,7 +13,7 @@ declare(strict_types=1); use Modules\Workflow\Controller\BackendController; -use Modules\Workflow\Models\PermissionState; +use Modules\Workflow\Models\PermissionCategory; use phpOMS\Account\PermissionType; use phpOMS\Router\RouteVerb; @@ -25,7 +25,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::TEMPLATE, + 'state' => PermissionCategory::TEMPLATE, ], ], ], @@ -36,7 +36,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::TEMPLATE, + 'state' => PermissionCategory::TEMPLATE, ], ], ], @@ -47,7 +47,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, - 'state' => PermissionState::TEMPLATE, + 'state' => PermissionCategory::TEMPLATE, ], ], ], @@ -58,7 +58,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::WORKFLOW, + 'state' => PermissionCategory::WORKFLOW, ], ], ], @@ -69,7 +69,7 @@ return [ 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, - 'state' => PermissionState::WORKFLOW, + 'state' => PermissionCategory::WORKFLOW, ], ], ], diff --git a/Controller/ApiController.php b/Controller/ApiController.php index d4e1926..069f085 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -19,7 +19,7 @@ use Modules\Admin\Models\NullAccount; use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullMedia; -use Modules\Workflow\Models\PermissionState; +use Modules\Workflow\Models\PermissionCategory; use Modules\Workflow\Models\WorkflowTemplate; use Modules\Workflow\Models\WorkflowTemplateMapper; use phpOMS\Account\PermissionType; @@ -81,8 +81,8 @@ final class ApiController extends Controller $isExport = \in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv', 'json']); // is allowed to read - if (!$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, null, self::NAME, PermissionState::REPORT, $template->getId()) - || ($isExport && !$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionState::EXPORT)) + if (!$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, null, self::NAME, PermissionCategory::REPORT, $template->getId()) + || ($isExport && !$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, $this->app->appName, self::NAME, PermissionCategory::EXPORT)) ) { $response->header->status = RequestStatusCode::R_403; @@ -343,7 +343,7 @@ final class ApiController extends Controller } // is allowed to create - if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionState::TEMPLATE)) { + if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionCategory::TEMPLATE)) { $response->header->status = RequestStatusCode::R_403; return; @@ -394,7 +394,7 @@ final class ApiController extends Controller $this->app->appName, self::NAME, self::NAME, - PermissionState::TEMPLATE, + PermissionCategory::TEMPLATE, $template->getId(), null, PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION, diff --git a/Models/PermissionState.php b/Models/PermissionCategory.php similarity index 91% rename from Models/PermissionState.php rename to Models/PermissionCategory.php index 445c7c2..95a963f 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionCategory.php @@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Enum; * @link https://karaka.app * @since 1.0.0 */ -abstract class PermissionState extends Enum +abstract class PermissionCategory extends Enum { public const WORKFLOW = 1;