Skip to content

[TASK] Return the application/json content type for REST responses #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samtuke merged 1 commit into from
Jul 24, 2017
Merged

[TASK] Return the application/json content type for REST responses #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Classes/Controller/SessionController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,14 @@ public function createAction(Request $request): Response
}

$response->setStatusCode($statusCode);
$response->headers->set('Content-Type', 'application/json');
$response->setContent(json_encode($responseContent, JSON_NUMERIC_CHECK | JSON_PRETTY_PRINT));

return $response;
}

/**
* Validated the request. If is it not valid, sets a status code and a response content.
* Validates the request. If is it not valid, sets a status code and a response.
*
* @param string $rawRequestContent
* @param Response $response
Expand Down Expand Up @@ -130,6 +131,7 @@ private function validateCreateRequest(string $rawRequestContent, Response $resp

if (!$isValid) {
$response->setStatusCode(400);
$response->headers->set('Content-Type', 'application/json');
$response->setContent(json_encode($responseContent, JSON_NUMERIC_CHECK | JSON_PRETTY_PRINT));
}

Expand Down
34 changes: 19 additions & 15 deletions Tests/Integration/Controller/SessionControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ public function postSessionsWithNoJsonReturnsError400()
{
$this->client->request('post', '/api/v2/sessions');

$responseContent = $this->client->getResponse()->getContent();
$parsedResponseContent = json_decode($responseContent, true);
$response = $this->client->getResponse();
$parsedResponseContent = json_decode($response->getContent(), true);

self::assertSame(400, $this->client->getResponse()->getStatusCode());
self::assertContains('application/json', (string)($response->headers));
self::assertSame(400, $response->getStatusCode());
self::assertSame(
[
'code' => 1500559729794,
Expand All @@ -81,10 +82,11 @@ public function postSessionsWithInvalidJsonReturnsError400()
{
$this->client->request('post', '/api/v2/sessions', [], [], [], 'Here be dragons, but no JSON.');

$responseContent = $this->client->getResponse()->getContent();
$parsedResponseContent = json_decode($responseContent, true);
$response = $this->client->getResponse();
$parsedResponseContent = json_decode($response->getContent(), true);

self::assertSame(400, $this->client->getResponse()->getStatusCode());
self::assertContains('application/json', (string)($response->headers));
self::assertSame(400, $response->getStatusCode());
self::assertSame(
[
'code' => 1500562402438,
Expand Down Expand Up @@ -116,10 +118,11 @@ public function postSessionsWithValidIncompleteJsonReturnsError400(string $jsonD
{
$this->client->request('post', '/api/v2/sessions', [], [], [], $jsonData);

$responseContent = $this->client->getResponse()->getContent();
$parsedResponseContent = json_decode($responseContent, true);
$response = $this->client->getResponse();
$parsedResponseContent = json_decode($response->getContent(), true);

self::assertSame(400, $this->client->getResponse()->getStatusCode());
self::assertContains('application/json', (string)($response->headers));
self::assertSame(400, $response->getStatusCode());
self::assertSame(
[
'code' => 1500562647846,
Expand All @@ -143,11 +146,11 @@ public function postSessionsWithInvalidCredentialsReturnsNotAuthorized()
$jsonData = ['loginName' => $loginName, 'password' => $password];

$this->client->request('post', '/api/v2/sessions', [], [], [], json_encode($jsonData));
$responseContent = $this->client->getResponse()->getContent();
$response = $this->client->getResponse();
$parsedResponseContent = json_decode($response->getContent(), true);

$parsedResponseContent = json_decode($responseContent, true);

self::assertSame(401, $this->client->getResponse()->getStatusCode());
self::assertContains('application/json', (string)($response->headers));
self::assertSame(401, $response->getStatusCode());
self::assertSame(
[
'code' => 1500567098798,
Expand All @@ -171,9 +174,10 @@ public function postSessionsActionWithValidCredentialsReturnsCreatedHttpStatus()
$jsonData = ['loginName' => $loginName, 'password' => $password];

$this->client->request('post', '/api/v2/sessions', [], [], [], json_encode($jsonData));
$responseContent = $this->client->getResponse()->getContent();
$response = $this->client->getResponse();

self::assertSame(201, $this->client->getResponse()->getStatusCode());
self::assertContains('application/json', (string)($response->headers));
self::assertSame(201, $response->getStatusCode());
}

/**
Expand Down