VladPolskiy/nextcloud-tables
1
0
Fork 0
mirror of https://github.com/nextcloud/tables.git synced 2025-07-31 05:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Controller): respond with 400 on InvalidArgumentExceptions

Browse Source 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon
2024-08-21 16:21:09 +02:00
parent 3eeb1101b9
commit 94da27afcb
5 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Service/ViewService.php
View File

@ -11,13 +11,12 @@ namespace OCA\Tables\Service;
use DateTime;
use Exception;
use InvalidArgumentException;
use OCA\Tables\AppInfo\Application;
use OCA\Tables\Db\Column;
use OCA\Tables\Db\Table;
use OCA\Tables\Db\View;
use OCA\Tables\Db\ViewMapper;
use OCA\Tables\Errors\InternalError;
use OCA\Tables\Errors\NotFoundError;
use OCA\Tables\Errors\PermissionError;
@ -74,7 +73,6 @@ class ViewService extends SuperService {
$this->contextService = $contextService;
}
/**
* @param Table $table
* @param string|null $userId
@ -246,6 +244,7 @@ class ViewService extends SuperService {
* @return View
* @throws InternalError
* @throws PermissionError
* @throws InvalidArgumentException
*/
public function update(int $id, array $data, ?string $userId = null, bool $skipTableEnhancement = false): View {
$userId = $this->permissionsService->preCheckUserId($userId);
@ -255,26 +254,42 @@ class ViewService extends SuperService {
// security
if (!$this->permissionsService->canManageView($view, $userId)) {
throw new PermissionError('PermissionError: can not update view with id '.$id);
throw new PermissionError('PermissionError: can not update view with id ' . $id);
}
$updatableParameter = ['title', 'emoji', 'description', 'columns', 'sort', 'filter'];
foreach ($data as $key => $value) {
if (!in_array($key, $updatableParameter)) {
throw new InternalError('View parameter '.$key.' can not be updated.');
throw new InternalError('View parameter ' . $key . ' can not be updated.');
}
$setterMethod = 'set'.ucfirst($key);
if ($key === 'columns') {
// we have to fetch the service here as ColumnService already depends on the ViewService, i.e. no DI
$columnService = \OCP\Server::get(ColumnService::class);
$columnIds = \json_decode($value, true);
$availableColumns = $columnService->findAllByTable($view->getTableId(), $view->getId(), $this->userId);
$availableColumns = array_map(static fn (Column $column) => $column->getId(), $availableColumns);
foreach ($columnIds as $columnId) {
if (!in_array($columnId, $availableColumns, true)) {
throw new InvalidArgumentException('Invalid column ID provided');
}
}
}
$setterMethod = 'set' . ucfirst($key);
$view->$setterMethod($value);
}
$time = new DateTime();
$view->setLastEditBy($userId);
$view->setLastEditAt($time->format('Y-m-d H:i:s'));
$view = $this->mapper->update($view);
if(!$skipTableEnhancement) {
if (!$skipTableEnhancement) {
$this->enhanceView($view, $userId);
}
return $view;
} catch (InvalidArgumentException $e) {
throw $e;
} catch (Exception $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);
throw new InternalError($e->getMessage());