Skip to content

Commit

Permalink
Privileges added
Browse files Browse the repository at this point in the history 
some bugfixes
  • Loading branch information
@tdausner
tdausner committed Jun 10, 2023
1 parent dba65d4 commit ba5be8c
Show file tree
Hide file tree
Showing 39 changed files with 428 additions and 10,931 deletions.
207 changes: 129 additions & 78 deletions Classes/Command/FolderCommandController.php
View file

Large diffs are not rendered by default.

44 changes: 27 additions & 17 deletions Classes/Controller/FolderServiceController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@
use Neos\Flow\Mvc\Controller\ActionController;
use Neos\Flow\Mvc\View\JsonView;
use Neos\Flow\Persistence\Exception\IllegalObjectTypeException;
use Neos\Flow\Security\Exception as SecurityException;
use Neos\Flow\Security\Exception\InvalidPrivilegeException;
use Neos\Flow\Session\Exception;
use Neos\Flow\Session\Exception\SessionNotStartedException;
use Neos\Flow\Session\SessionInterface;
use Neos\Folder\Domain\Repository\FolderRepository;
use Neos\Folder\Domain\Service\FolderContext;
use Neos\Folder\Domain\Service\FolderProvider;
use Neos\Neos\Service\UserService;

/**
* Controller for Folder Services
Expand Down Expand Up @@ -76,6 +79,12 @@ class FolderServiceController extends ActionController
*/
protected SessionInterface $currentSession;

/**
* @Flow\Inject
* @var UserService
*/
protected UserService $userService;

/**
* @Flow\Inject
* @var FolderContext
Expand All @@ -102,7 +111,7 @@ public function addAction(string $parent, string $title, string $nodeTypeName =
$dimensions = $this->_validateSessionAndGetDimensions(true);
$this->folderRepository->addFolder("$parent/$title", $nodeTypeName, $dimensions);
$this->view->assign('value', ['ok' => 'folder added']);
} catch (NodeException|SessionNotStartedException $exception) {
} catch (InvalidPrivilegeException|NodeException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand All @@ -119,10 +128,10 @@ protected function _validateSessionAndGetDimensions(bool $noDimensionsPermitted
try {
$this->currentSession->isStarted() || throw new SessionNotStartedException();
$this->currentSession->canBeResumed() && $this->currentSession->resume();
if ($noDimensionsPermitted && $_SERVER['QUERY_STRING'] === 'none') {
if ($noDimensionsPermitted && ($_SERVER['QUERY_STRING'] === 'none' || $_SERVER['QUERY_STRING'] === 'all')) {
$dimensions = [];
} else {
$dimensions = empty($_SERVER['QUERY_STRING'])
$dimensions = empty($_SERVER['QUERY_STRING'])
? NodePaths::explodeContextPath($this->currentSession->getData('lastVisitedNode'))['dimensions']
: $this->folderContext->verifyAndConvertDimensions($_SERVER['QUERY_STRING']);
}
Expand All @@ -135,9 +144,9 @@ protected function _validateSessionAndGetDimensions(bool $noDimensionsPermitted
/**
* Handle exception
*
* @param Error|Exception|IllegalObjectTypeException|InvalidArgumentException|NodeException $exception
* @param Error|Exception|InvalidPrivilegeException|IllegalObjectTypeException|InvalidArgumentException|NodeException|SecurityException|SessionNotStartedException $exception
*/
protected function _exception(Error|Exception|IllegalObjectTypeException|InvalidArgumentException|NodeException $exception): void
protected function _exception(Error|Exception|InvalidPrivilegeException|IllegalObjectTypeException|InvalidArgumentException|NodeException|SecurityException|SessionNotStartedException $exception): void
{
$this->response->setStatusCode($exception instanceof SessionNotStartedException ? 401 : 400); // Unauthorized : Bad request
$this->view->assign('value', ['error' => [$exception->getCode(), $exception->getMessage()]]);
Expand All @@ -152,17 +161,19 @@ protected function _exception(Error|Exception|IllegalObjectTypeException|Invalid
* On sort-modes `SORT_STRING|SORT_NATURAL` the flag `SORT_FLAG_CASE` is set (case-insensitive sort).
* Default sort mode `SORT_NATURAL` is defined in `Routes.yaml`.
*
* On request to a non-existing folder AND `Neos.Folder.defaults.adoptOnEmpty: true` the requested
* On request of a non-existing folder AND `Neos.Folder.defaults.adoptOnEmpty: true` the requested
* folder tree is adopted from the default dimension to the session's dimensions.
*
* Special case for dimension: "all" as query string for all available dimensions
*
* @param string $token Folder path or identifier
* @param string $sortMode Sort mode
*
*/
public function getTreeAction(string $token, string $sortMode): void
{
try {
$targetDimensions = $this->_validateSessionAndGetDimensions();
$targetDimensions = $this->_validateSessionAndGetDimensions(true);
try {
$providedFolder = (new FolderProvider())->new($token, $targetDimensions);
} catch (NodeException $exception) {
Expand All @@ -177,10 +188,10 @@ public function getTreeAction(string $token, string $sortMode): void
}
$folderTree = $this->folderRepository->getFolderTree($providedFolder, $targetDimensions, constant($sortMode));
empty($folderTree) && throw new NodeException(sprintf(
'Folder for token "%s" has no variant for dimensions "%s")',$token,
FolderContext::dimensionString($targetDimensions)),1676315838);
'Folder for token "%s" has no variant for dimensions "%s")', $token,
FolderContext::dimensionString($targetDimensions)), 1676315838);
$this->view->assign('value', $folderTree);
} catch (Error|InvalidArgumentException|NodeException|SessionNotStartedException $exception) {
} catch (Error|InvalidPrivilegeException|InvalidArgumentException|NodeException|SecurityException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand All @@ -206,7 +217,7 @@ public function titleAction(string $token, string $title): void
$this->folderRepository->setTitleAndTitlePath($folderNode, $title, $dimensions);
$this->folderRepository->persist();
$this->view->assign('value', ['ok' => "folder title set to \"$title\""]);
} catch (SessionNotStartedException|NodeException $exception) {
} catch (InvalidPrivilegeException|NodeException|SecurityException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand All @@ -226,7 +237,7 @@ public function removeAction(string $token, bool $recursive): void
$dimensions = $this->_validateSessionAndGetDimensions();
$this->folderRepository->removeFolder($token, $dimensions, $recursive);
$this->view->assign('value', ['ok' => 'folder(s) removed']);
} catch (InvalidArgumentException|NodeException|SessionNotStartedException $exception) {
} catch (InvalidArgumentException|InvalidPrivilegeException|NodeException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand All @@ -250,7 +261,7 @@ public function adoptAction(string $token, bool $recursive): void
$targetDimensions = $this->_validateSessionAndGetDimensions();
$this->folderContext->adoptFolder($token, $sourceDimensions, $targetDimensions, $recursive);
$this->view->assign('value', ['ok' => 'folder(s) adopted']);
} catch (InvalidArgumentException|NodeException|SessionNotStartedException $exception) {
} catch (InvalidArgumentException|InvalidPrivilegeException|NodeException|SecurityException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand All @@ -273,7 +284,7 @@ public function moveAction(string $token, string $target): void
$dimensions = $this->_validateSessionAndGetDimensions();
$newPath = $this->folderRepository->moveFolder($token, $target, $dimensions);
$this->view->assign('value', ['ok' => $newPath]);
} catch (NodeException|SessionNotStartedException $exception) {
} catch (InvalidPrivilegeException|NodeException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand Down Expand Up @@ -301,7 +312,7 @@ public function propertyAction(string $token, string $propertyString): void
$this->folderRepository->setProperties($token, $propertyString, $dimensions);
}
$this->view->assign('value', ['ok' => 'properties ' . (empty($propertyString) ? 'cleared' : 'set')]);
} catch (InvalidArgumentException|NodeException|SessionNotStartedException $exception) {
} catch (InvalidArgumentException|InvalidPrivilegeException|NodeException|SecurityException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}
Expand All @@ -327,9 +338,8 @@ public function associateAction(string $token, string $target, bool $remove): vo
$dimensions = $this->_validateSessionAndGetDimensions();
$this->folderRepository->associate($token, $target, $dimensions, $remove);
$this->view->assign('value', ['ok' => 'association ' . ($remove ? 'cleared' : 'set')]);
} catch (InvalidArgumentException|NodeException|SessionNotStartedException $exception) {
} catch (InvalidArgumentException|InvalidPrivilegeException|NodeException|SecurityException|SessionNotStartedException $exception) {
$this->_exception($exception);
}
}

}
Loading

0 comments on commit ba5be8c

Please sign in to comment.