Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-02-14 16:58:42 +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 3835a18659
commit d53ecf17bb
4 changed files with 44 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,31 @@
<?php <?php
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Exchange\Models\PermissionState;
use Modules\Exchange\Controller;
return [ return [
'^.*/api/admin/exchange/import/profile.*$' => [ '^.*/api/admin/exchange/import/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:apiExchangeImport', 'dest' => '\Modules\Exchange\Controller:apiExchangeImport',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::IMPORT,
],
], ],
], ],
'^.*/api/admin/exchange/export/profile.*$' => [ '^.*/api/admin/exchange/export/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:apiExchangeExport', 'dest' => '\Modules\Exchange\Controller:apiExchangeExport',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::CREATE,
'state' => PermissionState::EXPORT,
],
], ],
], ],
]; ];

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

@ -1,36 +1,64 @@
<?php <?php
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
use phpOMS\Account\PermissionType;
use Modules\Exchange\Models\PermissionState;
use Modules\Exchange\Controller;
return [ return [
'^.*/backend/admin/exchange/import/list.*$' => [ '^.*/backend/admin/exchange/import/list.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:viewExchangeImportList', 'dest' => '\Modules\Exchange\Controller:viewExchangeImportList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::IMPORT,
],
], ],
], ],
'^.*/backend/admin/exchange/export/list.*$' => [ '^.*/backend/admin/exchange/export/list.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:viewExchangeExportList', 'dest' => '\Modules\Exchange\Controller:viewExchangeExportList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::EXPORT,
],
], ],
], ],
'^.*/backend/admin/exchange/import/profile.*$' => [ '^.*/backend/admin/exchange/import/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:viewExchangeImport', 'dest' => '\Modules\Exchange\Controller:viewExchangeImport',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::IMPORT,
],
], ],
], ],
'^.*/backend/admin/exchange/export/profile.*$' => [ '^.*/backend/admin/exchange/export/profile.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:viewExchangeExport', 'dest' => '\Modules\Exchange\Controller:viewExchangeExport',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::EXPORT,
],
], ],
], ],
'^.*/backend/admin/exchange/dashboard.*$' => [ '^.*/backend/admin/exchange/dashboard.*$' => [
[ [
'dest' => '\Modules\Exchange\Controller:viewExchangeDashboard', 'dest' => '\Modules\Exchange\Controller:viewExchangeDashboard',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'permission' => [
'module' => Controller::MODULE_NAME,
'type' => PermissionType::READ,
'state' => PermissionState::DASHBOARD,
],
], ],
], ],
]; ];

8
Controller.php
View File

@ -227,14 +227,6 @@ final class Controller extends ModuleAbstract implements WebInterface
*/ */
public function apiExchangeImport(RequestAbstract $request, ResponseAbstract $response, $data = null) : void public function apiExchangeImport(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::IMPORT)
) {
$response->set('exchange_import', null);
$response->getHeader()->setStatusCode(RequestStatusCode::R_403);
return;
}
$import = $this->importDataFromRequest($request); $import = $this->importDataFromRequest($request);
$status = NotificationLevel::ERROR; $status = NotificationLevel::ERROR;
$message = 'Import failed.'; $message = 'Import failed.';

5
Models/PermissionState.php
View File

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