Jingga/oms-Tasks
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Tasks.git synced 2026-02-14 05:38:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix #96 fix #97

Browse Source
This commit is contained in:
Dennis Eichhorn 2018-08-17 20:02:29 +02:00
parent 521435ed0b
commit 4e121896ae
4 changed files with 59 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Admin/Routes/Web/Api.php
View File

@ -1,34 +1,67 @@
<?php <?php
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Tasks\Models\PermissionState;
use Modules\Tasks\Controller;
return [ return [
'^.*/api/task(\?.*|$)' => [ '^.*/api/task(\?.*|$)' => [
[ [
'dest' => '\Modules\Tasks\Controller:apiTaskCreate', 'dest' => '\Modules\Tasks\Controller:apiTaskCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::TASK,
],
], ],
[ [
'dest' => '\Modules\Tasks\Controller:apiTaskSet', 'dest' => '\Modules\Tasks\Controller:apiTaskSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::TASK,
],
], ],
[ [
'dest' => '\Modules\Tasks\Controller:apiTaskGet', 'dest' => '\Modules\Tasks\Controller:apiTaskGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
], ],
], ],
'^.*/api/task/element.*$' => [ '^.*/api/task/element.*$' => [
[ [
'dest' => '\Modules\Tasks\Controller:apiTaskElementCreate', 'dest' => '\Modules\Tasks\Controller:apiTaskElementCreate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::ELEMENT,
],
], ],
[ [
'dest' => '\Modules\Tasks\Controller:apiTaskElementSet', 'dest' => '\Modules\Tasks\Controller:apiTaskElementSet',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::MODIFY,
'state' => PermissionState::ELEMENT,
],
], ],
[ [
'dest' => '\Modules\Tasks\Controller:apiTaskElementGet', 'dest' => '\Modules\Tasks\Controller:apiTaskElementGet',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::ELEMENT,
],
], ],
], ],
]; ];

23
Admin/Routes/Web/Backend.php
View File

@ -1,30 +1,53 @@
<?php <?php
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Tasks\Models\PermissionState;
use Modules\Tasks\Controller;
return [ return [
'^.*/backend/task/dashboard.*$' => [ '^.*/backend/task/dashboard.*$' => [
[ [
'dest' => '\Modules\Tasks\Controller:viewTaskDashboard', 'dest' => '\Modules\Tasks\Controller:viewTaskDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
], ],
], ],
'^.*/backend/task/single.*$' => [ '^.*/backend/task/single.*$' => [
[ [
'dest' => '\Modules\Tasks\Controller:viewTaskView', 'dest' => '\Modules\Tasks\Controller:viewTaskView',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::TASK,
],
], ],
], ],
'^.*/backend/task/create.*$' => [ '^.*/backend/task/create.*$' => [
[ [
'dest' => '\Modules\Tasks\Controller:viewTaskCreate', 'dest' => '\Modules\Tasks\Controller:viewTaskCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::TASK,
],
], ],
], ],
'^.*/backend/task/analysis.*$' => [ '^.*/backend/task/analysis.*$' => [
[ [
'dest' => '\Modules\Tasks\Controller:viewTaskAnalysis', 'dest' => '\Modules\Tasks\Controller:viewTaskAnalysis',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::ANALYSIS,
],
], ],
], ],
]; ];

64
Controller.php
View File

@ -113,14 +113,6 @@ final class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $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/Tasks/Theme/Backend/task-dashboard'); $view->setTemplate('/Modules/Tasks/Theme/Backend/task-dashboard');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
@ -213,14 +205,6 @@ final class Controller extends ModuleAbstract implements WebInterface
{ {
$view = new View($this->app, $request, $response); $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::TASK)
) {
$view->setTemplate('/Web/Backend/Error/403_inline');
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return $view;
}
$view->setTemplate('/Modules/Tasks/Theme/Backend/task-create'); $view->setTemplate('/Modules/Tasks/Theme/Backend/task-create');
$view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response)); $view->addData('nav', $this->app->moduleManager->get('Navigation')->createNavigationMid(1001101001, $request, $response));
@ -302,14 +286,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiTaskCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskCreate(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::TASK)
) {
$response->set('task_create', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
if (!empty($val = $this->validateTaskCreate($request))) { if (!empty($val = $this->validateTaskCreate($request))) {
$response->set('task_create', new FormValidation($val)); $response->set('task_create', new FormValidation($val));
@ -369,14 +345,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiTaskGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK)
) {
$response->set('task_read', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
$task = TaskMapper::get((int) $request->getData('id')); $task = TaskMapper::get((int) $request->getData('id'));
$response->set($request->getUri()->__toString(), [ $response->set($request->getUri()->__toString(), [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
@ -401,14 +369,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK)
) {
$response->set('task_update', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
$task = $this->updateTaskFromRequest($request); $task = $this->updateTaskFromRequest($request);
$status = TaskMapper::update($task); $status = TaskMapper::update($task);
@ -479,14 +439,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiTaskElementCreate(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskElementCreate(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::TASK)
) {
$response->set('task_element_create', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
if (!empty($val = $this->validateTaskElementCreate($request))) { if (!empty($val = $this->validateTaskElementCreate($request))) {
$response->set('task_element_create', new FormValidation($val)); $response->set('task_element_create', new FormValidation($val));
@ -541,14 +493,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiTaskElementGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskElementGet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::READ, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK)
) {
$response->set('task_read', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
$task = TaskElementMapper::get((int) $request->getData('id')); $task = TaskElementMapper::get((int) $request->getData('id'));
$response->set($request->getUri()->__toString(), [ $response->set($request->getUri()->__toString(), [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
@ -573,14 +517,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiTaskElementSet(RequestAbstract $request, ResponseAbstract $response, $data = null) : void
{ {
if (!$this->app->accountManager->get($request->getHeader()->getAccount())->hasPermission(
PermissionType::MODIFY, $this->app->orgId, $this->app->appName, self::MODULE_NAME, PermissionState::TASK)
) {
$response->set('task_update', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
$task = $this->updateTaskElementFromRequest($request); $task = $this->updateTaskElementFromRequest($request);
$status = TaskElementMapper::update($task); $status = TaskElementMapper::update($task);

6
Models/PermissionState.php
View File

@ -26,7 +26,7 @@ use phpOMS\Stdlib\Base\Enum;
*/ */
abstract class PermissionState extends Enum abstract class PermissionState extends Enum
{ {
public const DASHBOARD = 1; public const TASK = 1;
public const TASK = 2; public const ELEMENT = 2;
public const TASKELEMENT = 3; public const ANALYSIS = 3;
} }