use Hateoas\Configuration\Route;
use Hateoas\Representation\Factory\PagerfantaFactory;
-use JMS\Serializer\SerializationContext;
use Nelmio\ApiDocBundle\Annotation\ApiDoc;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\HttpKernel\Exception\HttpException;
-use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Wallabag\CoreBundle\Entity\Entry;
use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Event\EntryDeletedEvent;
* {"name"="return_id", "dataType"="string", "required"=false, "format"="1 or 0", "description"="Set 1 if you want to retrieve ID in case entry(ies) exists, 0 by default"},
* {"name"="url", "dataType"="string", "required"=true, "format"="An url", "description"="Url to check if it exists"},
* {"name"="urls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="Urls (as an array) to check if it exists"}
+ * {"name"="hashedurl", "dataType"="string", "required"=true, "format"="An url", "description"="Md5 url to check if it exists"},
+ * {"name"="hashedurls", "dataType"="string", "required"=false, "format"="An array of urls (?urls[]=http...&urls[]=http...)", "description"="Md5 urls (as an array) to check if it exists"}
* }
* )
*
$returnId = (null === $request->query->get('return_id')) ? false : (bool) $request->query->get('return_id');
$urls = $request->query->get('urls', []);
+ $hashedUrls = $request->query->get('hashedurls', []);
+
// handle multiple urls first
- if (!empty($urls)) {
+ if (!empty($hashedUrls)) {
$results = [];
- foreach ($urls as $url) {
+ foreach ($hashedUrls as $hashedUrl) {
$res = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
- ->findByUrlAndUserId($url, $this->getUser()->getId());
+ ->findOneBy([
+ 'hashedUrl' => $hashedUrl,
+ 'user' => $this->getUser()->getId(),
+ ]);
- $results[$url] = $this->returnExistInformation($res, $returnId);
+ // $results[$url] = $this->returnExistInformation($res, $returnId);
+ $results[$hashedUrl] = $this->returnExistInformation($res, $returnId);
}
return $this->sendResponse($results);
}
// let's see if it is a simple url?
- $url = $request->query->get('url', '');
+ $hashedUrl = $request->query->get('hashedurl', '');
+
+ // if (empty($url)) {
+ // throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
+ // }
- if (empty($url)) {
- throw $this->createAccessDeniedException('URL is empty?, logged user id: ' . $this->getUser()->getId());
+ if (empty($hashedUrl)) {
+ throw $this->createAccessDeniedException('URL is empty?, logged user id: '.$this->getUser()->getId());
}
$res = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Entry')
- ->findByUrlAndUserId($url, $this->getUser()->getId());
-
- $exists = $this->returnExistInformation($res, $returnId);
+ // ->findByUrlAndUserId($url, $this->getUser()->getId());
+ ->findOneBy([
+ 'hashedUrl' => $hashedUrl,
+ 'user' => $this->getUser()->getId(),
+ ]);
- return $this->sendResponse(['exists' => $exists]);
+ return $this->sendResponse(['exists' => $this->returnExistInformation($res, $returnId)]);
}
/**
'tags' => $tags,
'since' => $since,
],
- UrlGeneratorInterface::ABSOLUTE_URL
+ true
)
);
* @ApiDoc(
* requirements={
* {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
+ * },
+ * parameters={
+ * {"name"="expect", "dataType"="string", "required"=false, "format"="id or entry", "description"="Only returns the id instead of the deleted entry's full entity if 'id' is specified. Default to entry"},
* }
* )
*
* @return JsonResponse
*/
- public function deleteEntriesAction(Entry $entry)
+ public function deleteEntriesAction(Entry $entry, Request $request)
{
+ $expect = $request->query->get('expect', 'entry');
+ if (!\in_array($expect, ['id', 'entry'], true)) {
+ throw new BadRequestHttpException(sprintf("expect: 'id' or 'entry' expected, %s given", $expect));
+ }
$this->validateAuthentication();
$this->validateUserAccess($entry->getUser()->getId());
- // We copy $entry to keep id in returned object
- $e = $entry;
+ $response = $this->sendResponse([
+ 'id' => $entry->getId(),
+ ]);
+ // We clone $entry to keep id in returned object
+ if ('entry' === $expect) {
+ $e = clone $entry;
+ $response = $this->sendResponse($e);
+ }
$em = $this->getDoctrine()->getManager();
$em->remove($entry);
// entry deleted, dispatch event about it!
$this->get('event_dispatcher')->dispatch(EntryDeletedEvent::NAME, new EntryDeletedEvent($entry));
- return $this->sendResponse($e);
+ return $response;
}
/**
return $this->sendResponse($results);
}
- /**
- * Shortcut to send data serialized in json.
- *
- * @param mixed $data
- *
- * @return JsonResponse
- */
- private function sendResponse($data)
- {
- // https://github.com/schmittjoh/JMSSerializerBundle/issues/293
- $context = new SerializationContext();
- $context->setSerializeNull(true);
-
- $json = $this->get('jms_serializer')->serialize($data, 'json', $context);
-
- return (new JsonResponse())->setJson($json);
- }
-
/**
* Retrieve value from the request.
* Used for POST & PATCH on a an entry.