Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-02-17 00:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes and item management improvements

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-24 18:11:37 +00:00
parent 260a17d565
commit 6f79d04171
1 changed files with 9 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
Controller/ApiController.php
View File

@ -31,14 +31,11 @@ use phpOMS\Message\ResponseAbstract;
use phpOMS\Model\Message\FormValidation; use phpOMS\Model\Message\FormValidation;
use phpOMS\System\File\Local\Directory; use phpOMS\System\File\Local\Directory;
use phpOMS\System\SystemUtils; use phpOMS\System\SystemUtils;
use phpOMS\Utils\ImageUtils;
use phpOMS\Utils\StringUtils; use phpOMS\Utils\StringUtils;
use Modules\Admin\Models\SettingsEnum; use Modules\Admin\Models\SettingsEnum;
use Modules\OnlineResourceWatcher\Models\SettingsEnum as OrwSettingsEnum; use Modules\OnlineResourceWatcher\Models\SettingsEnum as OrwSettingsEnum;
use Modules\Messages\Models\EmailMapper; use Modules\Messages\Models\EmailMapper;
use Modules\OnlineResourceWatcher\Models\InformBlacklistMapper; use Modules\OnlineResourceWatcher\Models\InformBlacklistMapper;
use phpOMS\Security\Guard;
use phpOMS\Uri\UriFactory;
/** /**
* OnlineResourceWatcher controller class. * OnlineResourceWatcher controller class.
@ -150,8 +147,7 @@ final class ApiController extends Controller
$resource = $this->createResourceFromRequest($request); $resource = $this->createResourceFromRequest($request);
$this->createModel($request->header->account, $resource, ResourceMapper::class, 'resource', $request->getOrigin()); $this->createModel($request->header->account, $resource, ResourceMapper::class, 'resource', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $resource);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Resource', 'Resource successfully created', $resource);
} }
/** /**
@ -661,27 +657,14 @@ final class ApiController extends Controller
if ($old->owner->id !== $request->header->account) { if ($old->owner->id !== $request->header->account) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
$response->set($request->uri->__toString(), [ $this->createInvalidPermissionResponse($request, $response, null);
'status' => NotificationLevel::WARNING,
'title' => 'Update',
'message' => 'Insufficient permissions to update resource.',
'response' => null,
]);
return; return;
} }
$new = $this->updateResourceFromRequest($request, clone $old); $new = $this->updateResourceFromRequest($request, clone $old);
$this->updateModel($request->header->account, $old, $new, ResourceMapper::class, 'resource', $request->getOrigin()); $this->updateModel($request->header->account, $old, $new, ResourceMapper::class, 'resource', $request->getOrigin());
$this->createStandardUpdateResponse($request, $response, $new);
$this->fillJsonResponse(
$request,
$response,
NotificationLevel::OK,
'',
$this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulUpdate'),
$new
);
} }
/** /**
@ -767,26 +750,13 @@ final class ApiController extends Controller
if ($resource->owner->id !== $request->header->account) { if ($resource->owner->id !== $request->header->account) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
$response->set($request->uri->__toString(), [ $this->createInvalidPermissionResponse($request, $response, null);
'status' => NotificationLevel::WARNING,
'title' => 'Delete',
'message' => 'Insufficient permissions to delete resource.',
'response' => null,
]);
return; return;
} }
$this->deleteModel($request->header->account, $resource, ResourceMapper::class, 'resource', $request->getOrigin()); $this->deleteModel($request->header->account, $resource, ResourceMapper::class, 'resource', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $resource);
$this->fillJsonResponse(
$request,
$response,
NotificationLevel::OK,
'',
$this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulDelete'),
$resource
);
} }
/** /**
@ -837,20 +807,14 @@ final class ApiController extends Controller
if ($resource->owner->id !== $request->header->account) { if ($resource->owner->id !== $request->header->account) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
$response->set($request->uri->__toString(), [ $this->createInvalidPermissionResponse($request, $response, null);
'status' => NotificationLevel::WARNING,
'title' => 'Create',
'message' => 'Insufficient permissions',
'response' => null,
]);
return; return;
} }
$resource = $this->createInformFromRequest($request); $resource = $this->createInformFromRequest($request);
$this->createModel($request->header->account, $resource, InformMapper::class, 'resource', $request->getOrigin()); $this->createModel($request->header->account, $resource, InformMapper::class, 'resource', $request->getOrigin());
$this->createStandardCreateResponse($request, $response, $resource);
$this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Inform', 'Successfully created', $resource);
} }
/** /**
@ -927,26 +891,13 @@ final class ApiController extends Controller
if ($resource->owner->id !== $request->header->account) { if ($resource->owner->id !== $request->header->account) {
$response->header->status = RequestStatusCode::R_403; $response->header->status = RequestStatusCode::R_403;
$response->set($request->uri->__toString(), [ $this->createInvalidPermissionResponse($request, $response, null);
'status' => NotificationLevel::WARNING,
'title' => 'Delete',
'message' => 'Insufficient permissions.',
'response' => null,
]);
return; return;
} }
$this->deleteModel($request->header->account, $inform, InformMapper::class, 'inform', $request->getOrigin()); $this->deleteModel($request->header->account, $inform, InformMapper::class, 'inform', $request->getOrigin());
$this->createStandardDeleteResponse($request, $response, $inform);
$this->fillJsonResponse(
$request,
$response,
NotificationLevel::OK,
'',
$this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulDelete'),
$inform
);
} }
/** /**