From d3c34ca155944cfc5d37897839e866e3fc2584d3 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 28 Oct 2017 07:31:12 +0200 Subject: [PATCH] Update service provider. --- app/Http/Middleware/StartFireflySession.php | 40 ++++++++--------- app/Providers/SessionServiceProvider.php | 49 +++++++++++++++++++++ config/app.php | 2 +- 3 files changed, 70 insertions(+), 21 deletions(-) create mode 100644 app/Providers/SessionServiceProvider.php diff --git a/app/Http/Middleware/StartFireflySession.php b/app/Http/Middleware/StartFireflySession.php index 31abbbcf5f..ed432ad1b7 100644 --- a/app/Http/Middleware/StartFireflySession.php +++ b/app/Http/Middleware/StartFireflySession.php @@ -43,25 +43,25 @@ class StartFireflySession extends StartSession * * @return mixed */ - public function handle($request, Closure $next) - { - return parent::handle($request, $next); // defer to the right stuff - } +// public function handle($request, Closure $next) +// { +// return parent::handle($request, $next); // defer to the right stuff +// } - /** - * Store the current URL for the request if necessary. - * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Contracts\Session\Session $session - * - * @return void - */ - protected function storeCurrentUrl(Request $request, $session) - { - $uri = $request->fullUrl(); - $strpos = strpos($uri, 'jscript'); - if ($request->method() === 'GET' && $request->route() && !$request->ajax() && $strpos === false) { - $session->setPreviousUrl($uri); - } - } +// /** +// * Store the current URL for the request if necessary. +// * +// * @param \Illuminate\Http\Request $request +// * @param \Illuminate\Contracts\Session\Session $session +// * +// * @return void +// */ +// protected function storeCurrentUrl(Request $request, $session) +// { +// $uri = $request->fullUrl(); +// $strpos = strpos($uri, 'jscript'); +// if ($request->method() === 'GET' && $request->route() && !$request->ajax() && $strpos === false) { +// $session->setPreviousUrl($uri); +// } +// } } \ No newline at end of file diff --git a/app/Providers/SessionServiceProvider.php b/app/Providers/SessionServiceProvider.php new file mode 100644 index 0000000000..b465661dca --- /dev/null +++ b/app/Providers/SessionServiceProvider.php @@ -0,0 +1,49 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Providers; + +use FireflyIII\Http\Middleware\StartFireflySession; +use Illuminate\Session\SessionServiceProvider as BaseSessionServiceProvider; + +/** + * Class SessionServiceProvider + * + * @package FireflyIII\Providers + */ +class SessionServiceProvider extends BaseSessionServiceProvider +{ + /** + * Register the service provider. + * + * @return void + */ + public function register() + { + $this->registerSessionManager(); + + $this->registerSessionDriver(); + + $this->app->singleton(StartFireflySession::class); + } +} \ No newline at end of file diff --git a/config/app.php b/config/app.php index eb14c0edab..36121a892f 100644 --- a/config/app.php +++ b/config/app.php @@ -57,7 +57,7 @@ return [ Illuminate\Queue\QueueServiceProvider::class, Illuminate\Redis\RedisServiceProvider::class, Illuminate\Auth\Passwords\PasswordResetServiceProvider::class, - Illuminate\Session\SessionServiceProvider::class, + FireflyIII\Providers\SessionServiceProvider::class, Illuminate\Translation\TranslationServiceProvider::class, Illuminate\Validation\ValidationServiceProvider::class, Illuminate\View\ViewServiceProvider::class,