mirror of
https://github.com/wallabag/wallabag.git
synced 2024-10-31 22:28:54 +00:00
Return 304 when content isn't reloaded using the API
Previously it was a 400 but this is more related to a real error. Using the API user should only know the content got reloaded or not. If reloaded: 200 otherwise: 304.
This commit is contained in:
parent
944b8d6175
commit
5cd0857e3c
2 changed files with 4 additions and 8 deletions
|
@ -287,7 +287,7 @@ class EntryRestController extends WallabagRestController
|
|||
|
||||
/**
|
||||
* Reload an entry.
|
||||
* A response with HTTP Status 400 will be return if we weren't able to update the content (because it hasn't changed or we got an error).
|
||||
* An empty response with HTTP Status 304 will be send if we weren't able to update the content (because it hasn't changed or we got an error).
|
||||
*
|
||||
* @ApiDoc(
|
||||
* requirements={
|
||||
|
@ -310,12 +310,12 @@ class EntryRestController extends WallabagRestController
|
|||
'entry' => $entry,
|
||||
]);
|
||||
|
||||
return new JsonResponse(['error' => 'Error while trying to fetch content'], 400);
|
||||
return new JsonResponse([], 304);
|
||||
}
|
||||
|
||||
// if refreshing entry failed, don't save it
|
||||
if ($this->getParameter('wallabag_core.fetching_error_message') === $entry->getContent()) {
|
||||
return new JsonResponse(['error' => 'Error while trying to extract content'], 400);
|
||||
return new JsonResponse([], 304);
|
||||
}
|
||||
|
||||
$em = $this->getDoctrine()->getManager();
|
||||
|
|
|
@ -690,11 +690,7 @@ class EntryRestControllerTest extends WallabagApiTestCase
|
|||
}
|
||||
|
||||
$this->client->request('PATCH', '/api/entries/'.$entry->getId().'/reload.json');
|
||||
$this->assertEquals(400, $this->client->getResponse()->getStatusCode());
|
||||
|
||||
$this->assertContains('Error while trying to extract content', $this->client->getResponse()->getContent());
|
||||
|
||||
$this->assertEquals('application/json', $this->client->getResponse()->headers->get('Content-Type'));
|
||||
$this->assertEquals(304, $this->client->getResponse()->getStatusCode());
|
||||
}
|
||||
|
||||
public function testReloadEntry()
|
||||
|
|
Loading…
Reference in a new issue