Micropub Update and “Swarm” Support
Much better micropub client/endpoint and the ability
to support ownyourswarm.
Squashed commit of the following:
commit b5be117b852b7a598da72325a4eaf831526c700a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 18 15:02:00 2017 +0100
Add a token endpoint test
commit 71b7ff68d088180770ca8c2fb43e33bf4b385a96
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 18 13:49:00 2017 +0100
Fix phpcs issue
commit 54d96d32f280127061254e7bc6dfe196e2e35a39
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 18 13:47:08 2017 +0100
Move token code into its own controller
commit 3ed2b4d36d57a9b3bf2a532eb262ec71fc9aa046
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 18 13:01:09 2017 +0100
Improve/fix code for issuing a token
commit 8c411a1df1d59f12dd1c1a4ac884f53dbd1b9351
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 18 12:59:33 2017 +0100
Remove sprurious comment
commit 1b8a3b6502a2b982f737fb4b58602995451e38b9
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon May 15 11:57:03 2017 +0100
Wrap helper functions in check for existence
commit 75c706b5a6c1fca7bf45038409689416a3b5ba4d
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon May 15 11:40:17 2017 +0100
Fix a test error, array_key_exists must be run on an array
commit 685e96501b8dc906c6945fca39721fb79fa34a8b
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Mon May 15 11:11:51 2017 +0100
Remove errant dd()
commit 02536ebaa6daec2a78bc79c44392ac5a82c3200e
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun May 14 21:37:17 2017 +0100
Test a typical ownyourswarm request
commit 31d959e35ccec9dac5986f93732d928c08e246c8
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun May 14 21:36:37 2017 +0100
Better tagging of notes
commit e3d4ff8b050ba41febed4d3ab0d30898f0056b33
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Sun May 14 21:35:35 2017 +0100
When a note has a “checkin” try and create the place if it doesn’t already exist
commit 4fc0dd0121ca09915a13f3c21c97611db1d744a6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri May 12 12:26:25 2017 +0100
better handling of exceptions, `return` the exctacted response method
commit 2e3ca3297d2f494eb88af732519bd7ea8bcc3611
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri May 12 11:22:52 2017 +0100
compser update and minor style tweak
commit b883d03cc349798230986a5cb50e23e370ce5a09
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 11 19:03:52 2017 +0100
Improve artisan tinker; see https://blog.tighten.co/supercharge-your-laravel-tinker-workflow
commit 8de63172fc7d367870624ff25d1ada92af2d61a7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 11 17:28:16 2017 +0100
Tweak code, make it slightly more readable by catching custom exception, and moving a repeated response into its own function
commit 8ff0a1196d254d8788477d26b548f2ecff0a7986
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 11 17:21:39 2017 +0100
Add a custom exception to catch
commit 3a568da65ef22b1b676ea8378cd51ce88750b6af
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Thu May 11 17:21:11 2017 +0100
composer update && yarn upgrade
commit b70242e616827eab6a2132f3e691ec91be689fb5
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed May 10 20:00:03 2017 +0100
modify some returns for style purposes
commit b65170ba1515cbb07beb66fcb3358d69d86cf3a2
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed May 10 19:39:46 2017 +0100
composer update
commit cb6198db03a8e8c5c365e88d565401dd6420be13
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed May 10 17:07:33 2017 +0100
composer update
commit 91cdd9e17ba192b833da76e0243829cd037170f3
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri Apr 28 21:41:12 2017 +0100
verify input array contains necessary data
commit 6b230278bfcf2707b7ea1af8e15acd0d7cd27623
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri Apr 28 21:40:30 2017 +0100
pass the right input content to the data array
commit 96f30d25810751328f75964e81899496add7292e
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri Apr 28 21:19:28 2017 +0100
Add support for the published property
commit 8168a14969711ff5f84d29eca73036980f9b5a6b
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri Apr 28 18:48:23 2017 +0100
Fix some bugs in the `normalize_url()` function and add some tests for the helpers functions
commit 34adcebefa7cafec8d26d438b0046120751780be
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri Apr 28 15:12:08 2017 +0100
Fix PSR-2 issues, exluding group use declarations
commit 4b6651c318d534db1fcb83e1b66562c6dd560165
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Fri Apr 28 12:36:54 2017 +0100
composer update
commit a0788ffb6bd4d24245986bf83fe349b8e39786cd
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed Apr 26 12:44:06 2017 +0100
Make the retreived a Note a model instance instead of collection, update the content of JSON resposes for updating a note
commit f444cfd570a8316a8bb961b901ca2beb3ba74cd2
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed Apr 26 12:43:23 2017 +0100
Add tests for updating a post
commit ada7e513263b1b0519600538a8a2cb757c74d520
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Wed Apr 26 12:42:50 2017 +0100
Add swarm_url column
commit f4e1dba1b315b3d923049f9f5c7a47a730267cb7
Merge: 7208ec5 400857a
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:33:28 2017 +0100
Merge pull request #50 from jonnybarnes/analysis-XNDLxp
Apply fixes from StyleCI
commit 400857af57f873bf63b452fdf65ed2632eef9311
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 14:33:06 2017 +0000
Apply fixes from StyleCI
commit 7208ec53ff51f0c5d002c222c465767c46c275b2
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:30:02 2017 +0100
Correct some tests, for example the error returned for the specific mistake in `getInvalidToken()` has changed
commit 60550667156d7306cf750768b89fa329742c3927
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:29:06 2017 +0100
Fix some typos
commit 0324cb010e77606e0f99e8bb68376b79995abffc
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:20:27 2017 +0100
Allow notes to be updated by a micropub client endpoint
commit b3b3170b359548d21ddae9a9572c182d2a7d51be
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:18:48 2017 +0100
When a note with a photo is being created, adjust for if URL is on my own endpoint, or somehwere else
commit a2437879b000728a2e7d2b91fa642f7cdfd1e698
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:17:25 2017 +0100
Modify method that returns URL to check if path is already a fully qualified URL
commit 64eb53e0f87cb5ee55013de5ed8e2487eee36f0c
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date: Tue Apr 25 15:16:12 2017 +0100
Add a method to find notes based on NewBase60 id
This commit is contained in:
parent
f9a133e727
commit
05d42467cf
25 changed files with 1283 additions and 698 deletions
|
|
@ -5,7 +5,6 @@ namespace App\Http\Controllers;
|
|||
use App\IndieWebUser;
|
||||
use IndieAuth\Client;
|
||||
use Illuminate\Http\Request;
|
||||
use App\Services\TokenService;
|
||||
|
||||
class IndieAuthController extends Controller
|
||||
{
|
||||
|
|
@ -15,23 +14,14 @@ class IndieAuthController extends Controller
|
|||
protected $client;
|
||||
|
||||
/**
|
||||
* The Token handling service.
|
||||
*/
|
||||
protected $tokenService;
|
||||
|
||||
/**
|
||||
* Inject the dependencies.
|
||||
* Inject the dependency.
|
||||
*
|
||||
* @param \IndieAuth\Client $client
|
||||
* @param \App\Services\TokenService $tokenService
|
||||
* @return void
|
||||
*/
|
||||
public function __construct(
|
||||
Client $client = null,
|
||||
TokenService $tokenService = null
|
||||
) {
|
||||
public function __construct(Client $client = null)
|
||||
{
|
||||
$this->client = $client ?? new Client();
|
||||
$this->tokenService = $tokenService ?? new TokenService();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -90,37 +80,6 @@ class IndieAuthController extends Controller
|
|||
return redirect(route('micropub-client'));
|
||||
}
|
||||
|
||||
/*
|
||||
$tokenEndpoint = $this->indieAuthService->getTokenEndpoint($request->input('me'));
|
||||
if ($tokenEndpoint === false) {
|
||||
return redirect(route('micropub-client'))->with(
|
||||
'error',
|
||||
'Unable to determine token endpoint'
|
||||
);
|
||||
}
|
||||
$data = [
|
||||
'endpoint' => $tokenEndpoint,
|
||||
'code' => $request->input('code'),
|
||||
'me' => $request->input('me'),
|
||||
'redirect_url' => route('indieauth-callback'),
|
||||
'client_id' => route('micropub-client'),
|
||||
'state' => $request->input('state'),
|
||||
];
|
||||
$token = $this->indieAuthService->getAccessToken($data);
|
||||
|
||||
if (array_key_exists('access_token', $token)) {
|
||||
$request->session()->put('me', $token['me']);
|
||||
$request->session()->put('token', $token['access_token']);
|
||||
|
||||
return redirect(route('micropub-client'));
|
||||
}
|
||||
|
||||
return redirect(route('micropub-client'))->with(
|
||||
'error',
|
||||
'Unable to get a token from the endpoint'
|
||||
);
|
||||
*/
|
||||
|
||||
/**
|
||||
* Log out the user, flush the session data.
|
||||
*
|
||||
|
|
@ -132,42 +91,4 @@ class IndieAuthController extends Controller
|
|||
|
||||
return redirect(route('micropub-client'));
|
||||
}
|
||||
|
||||
/**
|
||||
* If the user has auth’d via IndieAuth, issue a valid token.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function tokenEndpoint(Request $request)
|
||||
{
|
||||
$authData = [
|
||||
'code' => $request->input('code'),
|
||||
'me' => $request->input('me'),
|
||||
'redirect_url' => $request->input('redirect_uri'),
|
||||
'client_id' => $request->input('client_id'),
|
||||
'state' => $request->input('state'),
|
||||
];
|
||||
$auth = $this->indieAuthService->verifyIndieAuthCode($authData);
|
||||
if (array_key_exists('me', $auth)) {
|
||||
$scope = $auth['scope'] ?? '';
|
||||
$tokenData = [
|
||||
'me' => $request->input('me'),
|
||||
'client_id' => $request->input('client_id'),
|
||||
'scope' => $auth['scope'],
|
||||
];
|
||||
$token = $this->tokenService->getNewToken($tokenData);
|
||||
$content = http_build_query([
|
||||
'me' => $request->input('me'),
|
||||
'scope' => $scope,
|
||||
'access_token' => $token,
|
||||
]);
|
||||
|
||||
return response($content)
|
||||
->header('Content-Type', 'application/x-www-form-urlencoded');
|
||||
}
|
||||
$content = 'There was an error verifying the authorisation code.';
|
||||
|
||||
return response($content, 400);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue