From d4a3e57c8237ba228839c40cd46c6e2e130642d8 Mon Sep 17 00:00:00 2001 From: Maxime Renou Date: Mon, 11 May 2020 16:49:01 +0200 Subject: [PATCH] Button --- config/bconnect.php | 10 ++++++++-- resources/views/connect/button.blade.php | 29 +++++++++++++++++++++++++++++ src/Connect.php | 2 +- src/ConnectServiceProvider.php | 11 +++++++++++ src/View/Components/Button.php | 15 +++++++++++++++ 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 resources/views/connect/button.blade.php create mode 100644 src/View/Components/Button.php diff --git a/config/bconnect.php b/config/bconnect.php index eafea48..512eba2 100644 --- a/config/bconnect.php +++ b/config/bconnect.php @@ -1,15 +1,21 @@ \App\User::class, /** - * OAuth redirect URI + * Route that redirects to Bluesquare Connect */ - 'redirect' => env('BCONNECT_REDIRECT', url('/oauth/callback')), + 'login_url' => '/oauth/authorize', + + /** + * OAuth callback URL + */ + 'redirect_url' => env('BCONNECT_REDIRECT', url('/oauth/callback')), /** * OAuth client id diff --git a/resources/views/connect/button.blade.php b/resources/views/connect/button.blade.php new file mode 100644 index 0000000..1a9c20c --- /dev/null +++ b/resources/views/connect/button.blade.php @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Connect.php b/src/Connect.php index dabc46c..62ab41e 100644 --- a/src/Connect.php +++ b/src/Connect.php @@ -97,7 +97,7 @@ class Connect $query = http_build_query([ 'client_id' => config('bconnect.client_id'), 'scope' => config('bconnect.scopes'), - 'redirect_uri' => config('bconnect.redirect'), + 'redirect_uri' => config('bconnect.redirect_url'), 'response_type' => 'code', 'state' => $state ]); diff --git a/src/ConnectServiceProvider.php b/src/ConnectServiceProvider.php index 2ec83e3..545b349 100644 --- a/src/ConnectServiceProvider.php +++ b/src/ConnectServiceProvider.php @@ -2,6 +2,7 @@ namespace Bluesquare\Connect; +use Bluesquare\Connect\View\Components\Button; use Illuminate\Support\ServiceProvider; class ConnectServiceProvider extends ServiceProvider @@ -21,6 +22,16 @@ class ConnectServiceProvider extends ServiceProvider $this->app->singleton(Connect::class, function ($app) { return new Connect($app); }); + + $this->loadViewsFrom(__DIR__.'/../resources/views/connect', 'connect'); + + $this->publishes([ + __DIR__.'/../resources/views/connect' => resource_path('views/vendor/connect'), + ]); + + $this->loadViewComponentsAs('connect', [ + Button::class + ]); } /** diff --git a/src/View/Components/Button.php b/src/View/Components/Button.php new file mode 100644 index 0000000..e0ec7b8 --- /dev/null +++ b/src/View/Components/Button.php @@ -0,0 +1,15 @@ + config('bconnect.login_url') + ]); + } +}