diff --git a/src/API/ActivityController.php b/src/API/ActivityController.php index 0177f224..b5b2d749 100644 --- a/src/API/ActivityController.php +++ b/src/API/ActivityController.php @@ -16,6 +16,7 @@ use App\Event\ActivityMetaDefinitionEvent; use App\Form\API\ActivityApiEditForm; use App\Repository\ActivityRepository; use App\Repository\Query\ActivityQuery; +use App\Utils\SearchTerm; use FOS\RestBundle\Controller\Annotations as Rest; use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Request\ParamFetcherInterface; @@ -31,7 +32,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** * @RouteResource("Activity") * - * @Security("is_granted('ROLE_USER')") + * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')") */ class ActivityController extends BaseApiController { @@ -72,7 +73,9 @@ class ActivityController extends BaseApiController * @Rest\QueryParam(name="globalsFirst", requirements="true|false", strict=true, nullable=true, description="Deprecated parameter, value is not used any more") * @Rest\QueryParam(name="orderBy", requirements="id|name|project", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, name, project (default: name)") * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)") + * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term") * + * @param ParamFetcherInterface $paramFetcher * @return Response */ public function cgetAction(ParamFetcherInterface $paramFetcher) @@ -103,6 +106,10 @@ class ActivityController extends BaseApiController $query->setVisibility($visible); } + if (!empty($term = $paramFetcher->get('term'))) { + $query->setSearchTerm(new SearchTerm($term)); + } + $data = $this->repository->getActivitiesForQuery($query); $view = new View($data, 200); $view->getContext()->setGroups(['Default', 'Collection', 'Activity']); diff --git a/src/API/ConfigurationController.php b/src/API/ConfigurationController.php index 91efe8d1..dad3c0d9 100644 --- a/src/API/ConfigurationController.php +++ b/src/API/ConfigurationController.php @@ -21,7 +21,7 @@ use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security; use Swagger\Annotations as SWG; /** - * @Security("is_granted('ROLE_USER')") + * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')") */ class ConfigurationController extends BaseApiController { diff --git a/src/API/CustomerController.php b/src/API/CustomerController.php index 863bb05a..423cd09a 100644 --- a/src/API/CustomerController.php +++ b/src/API/CustomerController.php @@ -16,6 +16,7 @@ use App\Event\CustomerMetaDefinitionEvent; use App\Form\API\CustomerApiEditForm; use App\Repository\CustomerRepository; use App\Repository\Query\CustomerQuery; +use App\Utils\SearchTerm; use FOS\RestBundle\Controller\Annotations as Rest; use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Request\ParamFetcherInterface; @@ -31,7 +32,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** * @RouteResource("Customer") * - * @Security("is_granted('ROLE_USER')") + * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')") */ class CustomerController extends BaseApiController { @@ -69,7 +70,9 @@ class CustomerController extends BaseApiController * @Rest\QueryParam(name="visible", requirements="\d+", strict=true, nullable=true, description="Visibility status to filter activities (1=visible, 2=hidden, 3=both)") * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)") * @Rest\QueryParam(name="orderBy", requirements="id|name", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, name (default: name)") + * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term") * + * @param ParamFetcherInterface $paramFetcher * @return Response */ public function cgetAction(ParamFetcherInterface $paramFetcher) @@ -89,6 +92,10 @@ class CustomerController extends BaseApiController $query->setVisibility($visible); } + if (!empty($term = $paramFetcher->get('term'))) { + $query->setSearchTerm(new SearchTerm($term)); + } + $data = $this->repository->getCustomersForQuery($query); $view = new View($data, 200); $view->getContext()->setGroups(['Default', 'Collection', 'Customer']); diff --git a/src/API/ProjectController.php b/src/API/ProjectController.php index 87d84ccb..eb7f9402 100644 --- a/src/API/ProjectController.php +++ b/src/API/ProjectController.php @@ -16,6 +16,7 @@ use App\Event\ProjectMetaDefinitionEvent; use App\Form\API\ProjectApiEditForm; use App\Repository\ProjectRepository; use App\Repository\Query\ProjectQuery; +use App\Utils\SearchTerm; use FOS\RestBundle\Controller\Annotations as Rest; use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Request\ParamFetcherInterface; @@ -31,7 +32,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** * @RouteResource("Project") * - * @Security("is_granted('ROLE_USER')") + * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')") */ class ProjectController extends BaseApiController { @@ -70,6 +71,7 @@ class ProjectController extends BaseApiController * @Rest\QueryParam(name="visible", requirements="\d+", strict=true, nullable=true, description="Visibility status to filter projects (1=visible, 2=hidden, 3=both)") * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)") * @Rest\QueryParam(name="orderBy", requirements="id|name|customer", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, name, customer (default: name)") + * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term") * * @param ParamFetcherInterface $paramFetcher * @return Response @@ -95,6 +97,10 @@ class ProjectController extends BaseApiController $query->setVisibility($visible); } + if (!empty($term = $paramFetcher->get('term'))) { + $query->setSearchTerm(new SearchTerm($term)); + } + $data = $this->repository->getProjectsForQuery($query); $view = new View($data, 200); $view->getContext()->setGroups(['Default', 'Collection', 'Project']); diff --git a/src/API/TagController.php b/src/API/TagController.php index 5887b29a..120ac4b2 100644 --- a/src/API/TagController.php +++ b/src/API/TagController.php @@ -65,6 +65,7 @@ class TagController extends BaseApiController * * @Rest\QueryParam(name="name", strict=true, nullable=true, description="Search term to filter tag list") * + * @param ParamFetcherInterface $paramFetcher * @return Response */ public function cgetAction(ParamFetcherInterface $paramFetcher) diff --git a/src/API/TimesheetController.php b/src/API/TimesheetController.php index 6b27be33..0e88d3d3 100644 --- a/src/API/TimesheetController.php +++ b/src/API/TimesheetController.php @@ -22,6 +22,7 @@ use App\Repository\TimesheetRepository; use App\Timesheet\TrackingMode\TrackingModeInterface; use App\Timesheet\TrackingModeService; use App\Timesheet\UserDateTimeFactory; +use App\Utils\SearchTerm; use Doctrine\Common\Collections\ArrayCollection; use FOS\RestBundle\Controller\Annotations as Rest; use FOS\RestBundle\Controller\Annotations\RouteResource; @@ -42,7 +43,7 @@ use Symfony\Component\Validator\Validator\ValidatorInterface; /** * @RouteResource("Timesheet") * - * @Security("is_granted('ROLE_USER')") + * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')") */ class TimesheetController extends BaseApiController { @@ -124,6 +125,7 @@ class TimesheetController extends BaseApiController * @Rest\QueryParam(name="exported", requirements="0|1", strict=true, nullable=true, description="Use this flag if you want to filter for export state. Allowed values: 0=not exported, 1=exported (default: all)") * @Rest\QueryParam(name="active", requirements="0|1", strict=true, nullable=true, description="Filter for running/active records. Allowed values: 0=stopped, 1=active (default: all)") * @Rest\QueryParam(name="full", requirements="true", strict=true, nullable=true, description="Allows to fetch fully serialized objects including subresources (TimesheetSubCollection). Allowed values: true (default: false)") + * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term") * * @Security("is_granted('view_own_timesheet') or is_granted('view_other_timesheet')") * @@ -204,6 +206,10 @@ class TimesheetController extends BaseApiController } } + if (!empty($term = $paramFetcher->get('term'))) { + $query->setSearchTerm(new SearchTerm($term)); + } + /** @var Pagerfanta $data */ $data = $this->repository->getPagerfantaForQuery($query); $data = (array) $data->getCurrentPageResults(); diff --git a/src/API/UserController.php b/src/API/UserController.php index c3d3598f..b3b185ec 100644 --- a/src/API/UserController.php +++ b/src/API/UserController.php @@ -13,6 +13,7 @@ namespace App\API; use App\Repository\Query\UserQuery; use App\Repository\UserRepository; +use App\Utils\SearchTerm; use FOS\RestBundle\Controller\Annotations as Rest; use FOS\RestBundle\Controller\Annotations\RouteResource; use FOS\RestBundle\Request\ParamFetcherInterface; @@ -26,7 +27,7 @@ use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException; /** * @RouteResource("User") * - * @Security("is_granted('ROLE_USER')") + * @Security("is_granted('IS_AUTHENTICATED_REMEMBERED')") */ class UserController extends BaseApiController { @@ -65,9 +66,11 @@ class UserController extends BaseApiController * @Rest\QueryParam(name="visible", requirements="1|2|3", strict=true, nullable=true, description="Visibility status to filter users. Allowed values: 1=visible, 2=hidden, 3=all (default: 1)") * @Rest\QueryParam(name="orderBy", requirements="id|username|alias|email", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, username, alias, email (default: username)") * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: ASC)") + * @Rest\QueryParam(name="term", requirements="[a-zA-Z0-9 \-,:]+", strict=true, nullable=true, description="Free search term") * * @Security("is_granted('view_user')") * + * @param ParamFetcherInterface $paramFetcher * @return Response */ public function cgetAction(ParamFetcherInterface $paramFetcher) @@ -86,6 +89,10 @@ class UserController extends BaseApiController $query->setOrderBy($orderBy); } + if (!empty($term = $paramFetcher->get('term'))) { + $query->setSearchTerm(new SearchTerm($term)); + } + $data = $this->repository->getUsersForQuery($query); $view = new View($data, 200); $view->getContext()->setGroups(['Default', 'Collection', 'User']);