From f5d5d084944424e1f1a668c7d5838a0b72820bf0 Mon Sep 17 00:00:00 2001 From: smarcet Date: Wed, 30 Jan 2019 01:42:16 -0300 Subject: [PATCH] Fixed booting sequence for ClientAuthContextValidatorFactoryProvider bc was failing to get the current route for token endpoint Change-Id: Ia5a0b253e9b33c1d5888c8d7e7ec434a1b1ffb76 --- ...entAuthContextValidatorFactoryProvider.php | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php b/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php index 2caeefa6..5e479532 100644 --- a/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php +++ b/app/Providers/OAuth2/ClientAuthContextValidatorFactoryProvider.php @@ -26,15 +26,19 @@ final class ClientAuthContextValidatorFactoryProvider extends ServiceProvider public function boot() { - ClientAuthContextValidatorFactory::setTokenEndpointUrl - ( - URL::action('OAuth2\OAuth2ProviderController@token') - ); + // wait till app is fully booted so we have access to routes + $this->app->booted(function () { + ClientAuthContextValidatorFactory::setTokenEndpointUrl + ( + URL::action('OAuth2\OAuth2ProviderController@token') + ); + + ClientAuthContextValidatorFactory::setJWKSetReader + ( + App::make(\OAuth2\Services\IClientJWKSetReader::class) + ); + }); - ClientAuthContextValidatorFactory::setJWKSetReader - ( - App::make(\OAuth2\Services\IClientJWKSetReader::class) - ); } /** * Register the service provider.