use Nelmio\ApiDocBundle\Annotation\ApiDoc;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Service\Extractor;
class WallabagRestController extends Controller
{
+ /**
+ * @param Entry $entry
+ * @param string $tags
+ */
+ private function assignTagsToEntry(Entry $entry, $tags)
+ {
+ foreach (explode(',', $tags) as $label) {
+ $label = trim($label);
+ $tagEntity = $this
+ ->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Tag')
+ ->findOneByLabel($label);
+
+ if (is_null($tagEntity)) {
+ $tagEntity = new Tag($this->getUser());
+ $tagEntity->setLabel($label);
+ }
+
+ // only add the tag on the entry if the relation doesn't exist
+ if (!$entry->getTags()->contains($tagEntity)) {
+ $entry->addTag($tagEntity);
+ }
+ }
+ }
+
/**
* Retrieve salt for a giver user.
*
- * @ApiDoc(
- * parameters={
- * {"name"="username", "dataType"="string", "required"=true, "description"="username"}
- * }
- * )
+ * @ApiDoc()
* @return array
*/
public function getSaltAction($username)
* parameters={
* {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by archived status."},
* {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false, all entries by default", "description"="filter by starred status."},
- * {"name"="delete", "dataType"="boolean", "required"=false, "format"="true or false, default '0'", "description"="filter by deleted status."},
* {"name"="sort", "dataType"="string", "required"=false, "format"="'created' or 'updated', default 'created'", "description"="sort entries by date."},
* {"name"="order", "dataType"="string", "required"=false, "format"="'asc' or 'desc', default 'desc'", "description"="order of sort."},
* {"name"="page", "dataType"="integer", "required"=false, "format"="default '1'", "description"="what page you want."},
{
$isArchived = $request->query->get('archive');
$isStarred = $request->query->get('star');
- $isDeleted = $request->query->get('delete', 0);
$sort = $request->query->get('sort', 'created');
$order = $request->query->get('order', 'desc');
$page = $request->query->get('page', 1);
$entries = $this
->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
- ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $isDeleted, $sort, $order);
+ ->findEntries($this->getUser()->getId(), $isArchived, $isStarred, $sort, $order);
if (!($entries)) {
throw $this->createNotFoundException();
}
- return $entries;
+ $json = $this->get('serializer')->serialize($entries, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
*/
public function getEntryAction(Entry $entry)
{
- return $entry;
+ if ($entry->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
+ }
+
+ $json = $this->get('serializer')->serialize($entry, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
*/
public function postEntriesAction(Request $request)
{
- //TODO gérer si on passe les tags
$url = $request->request->get('url');
$content = Extractor::extract($url);
$entry->setUrl($url);
$entry->setTitle($request->request->get('title') ?: $content->getTitle());
$entry->setContent($content->getBody());
+
+ $tags = $request->request->get('tags', '');
+ if (!empty($tags)) {
+ $this->assignTagsToEntry($entry, $tags);
+ }
+
$em = $this->getDoctrine()->getManager();
$em->persist($entry);
$em->flush();
- return $entry;
+ $json = $this->get('serializer')->serialize($entry, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
* {"name"="tags", "dataType"="string", "required"=false, "format"="tag1,tag2,tag3", "description"="a comma-separated list of tags."},
* {"name"="archive", "dataType"="boolean", "required"=false, "format"="true or false", "description"="archived the entry."},
* {"name"="star", "dataType"="boolean", "required"=false, "format"="true or false", "description"="starred the entry."},
- * {"name"="delete", "dataType"="boolean", "required"=false, "format"="true or false", "description"="flag as deleted. Default false. In case that you don't want to *really* remove it.."},
- * }
+ * }
* )
* @return Entry
*/
public function patchEntriesAction(Entry $entry, Request $request)
{
+ if ($entry->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
+ }
+
$title = $request->request->get("title");
- $tags = $request->request->get("tags", array());
$isArchived = $request->request->get("archive");
- $isDeleted = $request->request->get("delete");
$isStarred = $request->request->get("star");
if (!is_null($title)) {
$entry->setArchived($isArchived);
}
- if (!is_null($isDeleted)) {
- $entry->setDeleted($isDeleted);
- }
-
if (!is_null($isStarred)) {
$entry->setStarred($isStarred);
}
+ $tags = $request->request->get('tags', '');
+ if (!empty($tags)) {
+ $this->assignTagsToEntry($entry, $tags);
+ }
+
$em = $this->getDoctrine()->getManager();
$em->flush();
- return $entry;
+ $json = $this->get('serializer')->serialize($entry, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
*/
public function deleteEntriesAction(Entry $entry)
{
- if ($entry->isDeleted()) {
- throw new NotFoundHttpException('This entry is already deleted');
+ if ($entry->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
}
$em = $this->getDoctrine()->getManager();
- $entry->setDeleted(1);
+ $em->remove($entry);
$em->flush();
- return $entry;
+ $json = $this->get('serializer')->serialize($entry, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
*/
public function getEntriesTagsAction(Entry $entry)
{
+ if ($entry->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
+ }
+
+ $json = $this->get('serializer')->serialize($entry->getTags(), 'json');
+
+ return new Response($json, 200, array('application/json'));
}
/**
* }
* )
*/
- public function postEntriesTagsAction(Entry $entry)
+ public function postEntriesTagsAction(Request $request, Entry $entry)
{
+ if ($entry->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
+ }
+
+ $tags = $request->request->get('tags', '');
+ if (!empty($tags)) {
+ $this->assignTagsToEntry($entry, $tags);
+ }
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+
+ $json = $this->get('serializer')->serialize($entry, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
*/
public function deleteEntriesTagsAction(Entry $entry, Tag $tag)
{
+ if ($entry->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
+ }
+
+ $entry->removeTag($tag);
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($entry);
+ $em->flush();
+
+ $json = $this->get('serializer')->serialize($entry, 'json');
+
+ return new JsonResponse($json, 200);
}
/**
* Retrieve all tags
*
- * @ApiDoc(
- * )
+ * @ApiDoc()
*/
public function getTagsAction()
{
- }
+ $json = $this->get('serializer')->serialize($this->getUser()->getTags(), 'json');
- /**
- * Retrieve a single tag
- *
- * @ApiDoc(
- * requirements={
- * {"name"="tag", "dataType"="string", "requirement"="\w+", "description"="The tag"}
- * }
- * )
- */
- public function getTagAction(Tag $tag)
- {
+ return new JsonResponse($json, 200);
}
/**
*/
public function deleteTagAction(Tag $tag)
{
+ if ($tag->getUser()->getId() != $this->getUser()->getId()) {
+ throw $this->createAccessDeniedException();
+ }
+
+ $em = $this->getDoctrine()->getManager();
+ $em->remove($tag);
+ $em->flush();
+
+ $json = $this->get('serializer')->serialize($tag, 'json');
+
+ return new JsonResponse($json, 200);
}
}
projects / github / wallabag / wallabag.git / blobdiff