Jingga/oms-Script
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Script.git synced 2026-02-10 02:18:40 +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:29 +01:00
parent b5d5acc6a8
commit c317da74a4
5 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Helper\Controller\ApiController; use Modules\Helper\Controller\ApiController;
use Modules\Helper\Models\PermissionState; use Modules\Helper\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' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::REPORT, 'state' => PermissionCategory::REPORT,
], ],
], ],
], ],
@ -36,7 +36,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::TEMPLATE, 'state' => PermissionCategory::TEMPLATE,
], ],
], ],
], ],
@ -47,7 +47,7 @@ return [
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::REPORT, 'state' => PermissionCategory::REPORT,
], ],
], ],
], ],

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

@ -13,7 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
use Modules\Helper\Controller\BackendController; use Modules\Helper\Controller\BackendController;
use Modules\Helper\Models\PermissionState; use Modules\Helper\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::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TEMPLATE, 'state' => PermissionCategory::TEMPLATE,
], ],
], ],
[ [
@ -34,7 +34,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::TEMPLATE, 'state' => PermissionCategory::TEMPLATE,
], ],
], ],
], ],
@ -45,7 +45,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::REPORT, 'state' => PermissionCategory::REPORT,
], ],
], ],
[ [
@ -54,7 +54,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
'state' => PermissionState::REPORT, 'state' => PermissionCategory::REPORT,
], ],
], ],
], ],
@ -65,7 +65,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::REPORT, 'state' => PermissionCategory::REPORT,
], ],
], ],
], ],
@ -76,7 +76,7 @@ return [
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
'state' => PermissionState::REPORT, 'state' => PermissionCategory::REPORT,
], ],
], ],
], ],

14
Controller/ApiController.php
View File

@ -18,7 +18,7 @@ use Modules\Admin\Models\AccountPermission;
use Modules\Admin\Models\NullAccount; use Modules\Admin\Models\NullAccount;
use Modules\Helper\Models\NullReport; use Modules\Helper\Models\NullReport;
use Modules\Helper\Models\NullTemplate; use Modules\Helper\Models\NullTemplate;
use Modules\Helper\Models\PermissionState; use Modules\Helper\Models\PermissionCategory;
use Modules\Helper\Models\Report; use Modules\Helper\Models\Report;
use Modules\Helper\Models\ReportMapper; use Modules\Helper\Models\ReportMapper;
use Modules\Helper\Models\Template; use Modules\Helper\Models\Template;
@ -91,8 +91,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;
@ -353,7 +353,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;
@ -404,7 +404,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,
@ -509,7 +509,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::REPORT)) { if (!$this->app->accountManager->get($request->header->account)->hasPermission(PermissionType::CREATE, $this->app->orgId, null, self::NAME, PermissionCategory::REPORT)) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
return; return;
@ -551,7 +551,7 @@ final class ApiController extends Controller
$this->app->appName, $this->app->appName,
self::NAME, self::NAME,
self::NAME, self::NAME,
PermissionState::REPORT, PermissionCategory::REPORT,
$report->getId(), $report->getId(),
null, null,
PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION, PermissionType::READ | PermissionType::MODIFY | PermissionType::DELETE | PermissionType::PERMISSION,

34
Models/PermissionCategory.php Executable file
View File

@ -0,0 +1,34 @@
<?php
/**
* Karaka
*
* PHP Version 8.0
*
* @package Modules\Helper\Models
* @copyright Dennis Eichhorn
* @license OMS License 1.0
* @version 1.0.0
* @link https://karaka.app
*/
declare(strict_types=1);
namespace Modules\Helper\Models;
use phpOMS\Stdlib\Base\Enum;
/**
* Permision state enum.
*
* @package Modules\Helper\Models
* @license OMS License 1.0
* @link https://karaka.app
* @since 1.0.0
*/
abstract class PermissionCategory extends Enum
{
public const TEMPLATE = 1;
public const REPORT = 2;
public const EXPORT = 3;
}

2
Models/PermissionState.php Executable file → Normal file
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 TEMPLATE = 1; public const TEMPLATE = 1;