jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Merge branch 'release/0.0.7.1'

Browse source
This commit is contained in:
Jonny Barnes 2016-07-04 16:29:48 +01:00
commit d1657dd382
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/MicropubController.php
View file

@ -85,7 +85,7 @@ EOD;
} }
} }
} }
$content = <<<EOD $content = <<<'EOD'
{ {
"response": "error", "response": "error",
"error": "invalid_token", "error": "invalid_token",
@ -96,7 +96,7 @@ EOD;
return (new Response($content, 400)) return (new Response($content, 400))
->header('Content-Type', 'application/json'); ->header('Content-Type', 'application/json');
} }
$content = <<<EOD $content = <<<'EOD'
{ {
"response": "error", "response": "error",
"error": "no_token", "error": "no_token",
@ -126,13 +126,14 @@ EOD;
$valid = $this->tokenService->validateToken($token); $valid = $this->tokenService->validateToken($token);
if ($valid === null) { if ($valid === null) {
$content = <<<EOD $content = <<<'EOD'
{ {
"respose": "error", "respose": "error",
"error": "invalid_token", "error": "invalid_token",
"error_description": "The provided token did not pass validation" "error_description": "The provided token did not pass validation"
} }
EOD; EOD;
return (new Response($content, 400)) return (new Response($content, 400))
->header('Content-Type', 'application/json'); ->header('Content-Type', 'application/json');
} }
@ -165,7 +166,7 @@ EOD;
return response()->json([ return response()->json([
'response' => 'places', 'response' => 'places',
'places' => $places 'places' => $places,
]); ]);
} }
//nope, ho about a config query? //nope, ho about a config query?
@ -199,7 +200,7 @@ EOD;
]); ]);
} }
$content = 'No OAuth token sent with request.'; $content = 'No OAuth token sent with request.';
$content = <<<EOD $content = <<<'EOD'
{ {
"response": "error", "response": "error",
"error": "no_token", "error": "no_token",

3
changelog.md
View file

@ -1,5 +1,8 @@
# Changelog # Changelog
## Version 0.0.7.1 (2016-07-04)
- Minor style fixes
## Version 0.0.7 (2016-07-04) ## Version 0.0.7 (2016-07-04)
- Use JSON for syndication endpoint query response - Use JSON for syndication endpoint query response
- Use JSON for all micropub requests - Use JSON for all micropub requests