Jingga/oms-Workflow
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Workflow.git synced 2026-01-11 14:58:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

changed badly named permission type to permission category because type should only be read/write/...

Browse Source
This commit is contained in:
Dennis Eichhorn 2022-03-17 23:01:30 +01:00
parent fe2a9c88f3
commit 09e3dc0336
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Workflow\Controller\BackendController; use Modules\Workflow\Controller\BackendController;
use Modules\Workflow\Models\PermissionState; use Modules\Workflow\Models\PermissionCategory;
use phpOMS\Account\PermissionType; use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
@ -25,7 +25,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TEMPLATE, 'state' => PermissionCategory::TEMPLATE,
], ],
], ],
], ],
@ -36,7 +36,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TEMPLATE, 'state' => PermissionCategory::TEMPLATE,
], ],
], ],
], ],
@ -47,7 +47,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TEMPLATE, 'state' => PermissionCategory::TEMPLATE,
], ],
], ],
], ],
@ -58,7 +58,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WORKFLOW, 'state' => PermissionCategory::WORKFLOW,
], ],
], ],
], ],
@ -69,7 +69,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::WORKFLOW, 'state' => PermissionCategory::WORKFLOW,
], ],
], ],
], ],

10
Controller/ApiController.php
View File

@ -19,7 +19,7 @@ use Modules\Admin\Models\NullAccount;
use Modules\Media\Models\CollectionMapper; use Modules\Media\Models\CollectionMapper;
use Modules\Media\Models\NullCollection; use Modules\Media\Models\NullCollection;
use Modules\Media\Models\NullMedia; use Modules\Media\Models\NullMedia;
use Modules\Workflow\Models\PermissionState; use Modules\Workflow\Models\PermissionCategory;
use Modules\Workflow\Models\WorkflowTemplate; use Modules\Workflow\Models\WorkflowTemplate;
use Modules\Workflow\Models\WorkflowTemplateMapper; use Modules\Workflow\Models\WorkflowTemplateMapper;
use phpOMS\Account\PermissionType; 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']); $isExport = \in_array($request->getData('type'), ['xlsx', 'pdf', 'docx', 'pptx', 'csv', 'json']);
// is allowed to read // is allowed to read
if (!$this->app->accountManager->get($accountId)->hasPermission(PermissionType::READ, $this->app->orgId, null, self::NAME, PermissionState::REPORT, $template->getId()) 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, PermissionState::EXPORT)) || ($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; $response->header->status = RequestStatusCode::R_403;
@ -343,7 +343,7 @@ final class ApiController extends Controller
} }
// is allowed to create // 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; $response->header->status = RequestStatusCode::R_403;
return; return;
@ -394,7 +394,7 @@ final class ApiController extends Controller
$this->app->appName, $this->app->appName,
self::NAME, self::NAME,
self::NAME, self::NAME,
PermissionState::TEMPLATE, PermissionCategory::TEMPLATE,
$template->getId(), $template->getId(),
null, null,
PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION, PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION,

2
Models/PermissionState.php → Models/PermissionCategory.php
View File

@ -24,7 +24,7 @@ use phpOMS\Stdlib\Base\Enum;
* @link https://karaka.app * @link https://karaka.app
* @since 1.0.0 * @since 1.0.0
*/ */
abstract class PermissionState extends Enum abstract class PermissionCategory extends Enum
{ {
public const WORKFLOW = 1; public const WORKFLOW = 1;