From acc6598da154acb7593962d06480d884ef33e4f4 Mon Sep 17 00:00:00 2001 From: Deon George Date: Sat, 20 Jan 2024 13:25:54 +1100 Subject: [PATCH] Move ApplicationSession::class earlier, we are dependant on config('server') existing when loading user details --- app/Http/Kernel.php | 2 +- app/Http/Middleware/ApplicationSession.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 9c42173..f8730c3 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -35,13 +35,13 @@ class Kernel extends HttpKernel \App\Http\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, + ApplicationSession::class, SwapinAuthUser::class, \Illuminate\Session\Middleware\AuthenticateSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class, - ApplicationSession::class, CheckUpdate::class, ], diff --git a/app/Http/Middleware/ApplicationSession.php b/app/Http/Middleware/ApplicationSession.php index dd6f028..20fdde7 100644 --- a/app/Http/Middleware/ApplicationSession.php +++ b/app/Http/Middleware/ApplicationSession.php @@ -20,10 +20,10 @@ class ApplicationSession */ public function handle($request,Closure $next) { - view()->share('user', auth()->user() ?: new User); - \Config::set('server',new Server); + view()->share('user', auth()->user() ?: new User); + return $next($request); } } \ No newline at end of file