diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index d911989..96027a5 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -1,12 +1,20 @@ [ [ 'dest' => '\Modules\Editor\Controller:apiEditorCreate', 'verb' => RouteVerb::SET, + 'permission' => [ + 'module' => Controller::MODULE_NAME, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DOC, + ], ], ], ]; diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 9dfdccd..736a635 100644 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -1,28 +1,51 @@ [ [ 'dest' => '\Modules\Editor\Controller:setUpEditorEditor', 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => Controller::MODULE_NAME, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DOC, + ], ], [ 'dest' => '\Modules\Editor\Controller:viewEditorCreate', 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => Controller::MODULE_NAME, + 'type' => PermissionType::CREATE, + 'state' => PermissionState::DOC, + ], ], ], '^.*/backend/editor/list.*$' => [ [ 'dest' => '\Modules\Editor\Controller:viewEditorList', 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => Controller::MODULE_NAME, + 'type' => PermissionType::READ, + 'state' => PermissionState::DOC, + ], ], ], '^.*/backend/editor/single.*$' => [ [ 'dest' => '\Modules\Editor\Controller:viewEditorSingle', 'verb' => RouteVerb::GET, + 'permission' => [ + 'module' => Controller::MODULE_NAME, + 'type' => PermissionType::READ, + 'state' => PermissionState::DOC, + ], ], ], ]; diff --git a/Controller.php b/Controller.php index f868a45..8dfbace 100644 --- a/Controller.php +++ b/Controller.php @@ -122,14 +122,6 @@ final class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); - if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( - PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC) - ) { - $view->setTemplate('/Web/Backend/Error/403_inline'); - $response->getHeader()->setStatusCode(RequestStatusCode::R_403); - return $view; - } - $view->setTemplate('/Modules/Editor/Theme/Backend/editor-create'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); @@ -153,14 +145,6 @@ final class Controller extends ModuleAbstract implements WebInterface { $view = new View($this->app, $request, $response); - if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( - PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DASHBOARD) - ) { - $view->setTemplate('/Web/Backend/Error/403_inline'); - $response->getHeader()->setStatusCode(RequestStatusCode::R_403); - return $view; - } - $view->setTemplate('/Modules/Editor/Theme/Backend/editor-list'); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1005301001, $request, $response)); @@ -228,14 +212,6 @@ final class Controller extends ModuleAbstract implements WebInterface */ public function apiEditorCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void { - if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission( - PermissionType::CREATE, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::DOC) - ) { - $response->set('editor_create', null); - $response->getHeader()->setStatusCode(RequestStatusCode::R_403); - return; - } - if (!empty($val = $this->validateEditorCreate($request))) { $response->set('editor_create', new FormValidation($val)); diff --git a/Models/PermissionState.php b/Models/PermissionState.php index c0092e2..b02ba82 100644 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -26,6 +26,5 @@ use phpOMS\Stdlib\Base\Enum; */ abstract class PermissionState extends Enum { - public const DASHBOARD = 1; - public const DOC = 2; + public const DOC = 1; }