From c1eb39de57a9030665727251097477857a8280bd Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 18 May 2017 17:16:28 +0100 Subject: [PATCH 1/4] Show error messages in config page --- resources/views/micropub/config.blade.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/views/micropub/config.blade.php b/resources/views/micropub/config.blade.php index ea97003a..da781920 100644 --- a/resources/views/micropub/config.blade.php +++ b/resources/views/micropub/config.blade.php @@ -5,6 +5,9 @@ Micropub Config « @stop @section('content') +@if (session('error')) +

{{ session('error') }}

+@endif

The values for your micropub endpoint.

Me (your url)
{{ $data['me'] }}
From 4b26b1ab13ec78d9b90cc016bc0d0203167fe134 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 18 May 2017 17:17:08 +0100 Subject: [PATCH 2/4] Follow docs method for redirecting to a named route --- .../Controllers/MicropubClientController.php | 26 +++++++++++-------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/MicropubClientController.php b/app/Http/Controllers/MicropubClientController.php index 2937a7d3..ef9ffa28 100644 --- a/app/Http/Controllers/MicropubClientController.php +++ b/app/Http/Controllers/MicropubClientController.php @@ -90,7 +90,7 @@ class MicropubClientController extends Controller $mediaURLsToSave = array_merge($storedMediaURLs, $mediaURLs); $request->session()->put('media-links', $mediaURLsToSave); - return redirect(route('micropub-client')); + return redirect()->route('micropub-client'); } public function clearLinks(Request $request) @@ -114,12 +114,12 @@ class MicropubClientController extends Controller $user = IndieWebUser::where('me', $url)->firstOrFail(); if ($user->token == null) { - return redirect(route('micropub-client'))->with('error', 'You haven’t requested a token yet'); + return redirect()->route('micropub-client')->with('error', 'You haven’t requested a token yet'); } $micropubEndpoint = $this->indieClient->discoverMicropubEndpoint($url); if (! $micropubEndpoint) { - return redirect(route('micropub-client'))->with('error', 'Unable to determine micropub API endpoint'); + return redirect()->route('micropub-client')->with('error', 'Unable to determine micropub API endpoint'); } $headers = [ @@ -183,7 +183,7 @@ class MicropubClientController extends Controller 'headers' => $headers, ]); } catch (\GuzzleHttp\Exception\BadResponseException $e) { - return redirect(route('micropub-client'))->with( + return redirect()->route('micropub-client')->with( 'error', 'There was a bad response from the micropub endpoint.' ); @@ -231,7 +231,7 @@ class MicropubClientController extends Controller 'headers' => $headers, ]); } catch (\GuzzleHttp\Exception\BadResponseException $e) { - return redirect(route('micropub-client'))->with( + return redirect()->route('micropub-client')->with( 'error', 'There was a bad response from the micropub endpoint.' ); @@ -248,7 +248,7 @@ class MicropubClientController extends Controller } } - return redirect(route('micropub-client'))->with('error', 'Endpoint didn’t create the note.'); + return redirect()->route('micropub-client')->with('error', 'Endpoint didn’t create the note.'); } /** @@ -305,10 +305,10 @@ class MicropubClientController extends Controller return redirect($authorizationURL); } - return back(); + return redirect()->route('micropub-config')->with('error', 'Unable to find authorisation endpoint'); } - return back(); + return redirect()->route('micropub-config')->with('error', 'You aren’t logged in'); } /** @@ -317,7 +317,7 @@ class MicropubClientController extends Controller public function getNewTokenCallback(Request $request) { if ($request->input('state') !== $request->session()->get('state')) { - return route('micropub-client')->with('error', 'The state didn’t match.'); + return redirect()->route('micropub-config')->with('error', 'The state didn’t match.'); } $tokenEndpoint = $this->indieClient->discoverTokenEndpoint(normalize_url($request->input('me'))); if ($tokenEndpoint) { @@ -335,9 +335,13 @@ class MicropubClientController extends Controller $user->token = $token['access_token']; $user->save(); - return redirect('micropub-config'); + return redirect()->route('micropub-config'); } + + return redirect()->route('micropub-config')->with('error', 'Error getting token from the endpoint'); } + + return redirect()->route('micropub-config')->with('error', 'Unable to find token endpoint'); } /** @@ -390,7 +394,7 @@ class MicropubClientController extends Controller $user->syntax = $request->syntax; $user->save(); - return redirect(route('micropub-config')); + return redirect()->route('micropub-config'); } /** From 4934118248197091d35741887ae84e921afcc0e4 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 18 May 2017 17:17:54 +0100 Subject: [PATCH 3/4] Update changelog --- changelog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changelog.md b/changelog.md index f4ab8963..ea2783f1 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,8 @@ # Changelog +## Version {next} + - Tweak config page and get token method to better handle/show errors + ## Version 0.5.2 (2017-05-18) - Fix variable issues in making client page From de30c2e98a7e5a19582295dbc7a98ee121ca0182 Mon Sep 17 00:00:00 2001 From: Jonny Barnes Date: Thu, 18 May 2017 17:18:27 +0100 Subject: [PATCH 4/4] Bump version number to 0.5.3 --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index ea2783f1..72081081 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # Changelog -## Version {next} +## Version 0.5.3 (2017-05-18) - Tweak config page and get token method to better handle/show errors ## Version 0.5.2 (2017-05-18)