From 7b699597d13212848bc031fe2a587f2c519eeea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 14 Dec 2023 10:24:08 +0100 Subject: [PATCH] Move theme version check to a dedicaced middleware as it would prevent flash to flush --- app/Http/Kernel.php | 3 +- app/Http/Middleware/CheckThemeVersion.php | 43 +++++++++++++++++++++++ app/Providers/ViewServiceProvider.php | 17 --------- 3 files changed, 45 insertions(+), 18 deletions(-) create mode 100644 app/Http/Middleware/CheckThemeVersion.php diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 3839305..ddbaac7 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -37,7 +37,8 @@ class Kernel extends HttpKernel \Illuminate\View\Middleware\ShareErrorsFromSession::class, \App\Http\Middleware\VerifyCsrfToken::class, \Illuminate\Routing\Middleware\SubstituteBindings::class, - \App\Http\Middleware\SecureHeaders::class + \App\Http\Middleware\SecureHeaders::class, + \App\Http\Middleware\CheckThemeVersion::class ], 'api' => [ diff --git a/app/Http/Middleware/CheckThemeVersion.php b/app/Http/Middleware/CheckThemeVersion.php new file mode 100644 index 0000000..0707543 --- /dev/null +++ b/app/Http/Middleware/CheckThemeVersion.php @@ -0,0 +1,43 @@ +version)->explode('.'); + $themeVer = Str::of(config('theme.version'))->explode('.'); + if ( + // * Major check + Arr::get($appVer, 0) !== Arr::get($themeVer, 0) or + // * Patch check + Arr::get($appVer, 1) !== Arr::get($themeVer, 1) + ) { + Session::flash('warning', trans( + 'Ce thème n\'a semble t-il pas été vérifié pour cette version du moteur' + )); + } + + return $next($request); + } +} diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index 9a3eddb..7304b6b 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -5,13 +5,10 @@ namespace App\Providers; use App\Models\Prize; use App\Models\Settings; use Illuminate\Pagination\Paginator; -use Illuminate\Support\Arr; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\File; -use Illuminate\Support\Facades\Session; use Illuminate\Support\Facades\View; use Illuminate\Support\ServiceProvider; -use Illuminate\Support\Str; class ViewServiceProvider extends ServiceProvider { @@ -37,20 +34,6 @@ class ViewServiceProvider extends ServiceProvider View::share('cpsr_version', $appInfos->version); } - // * Assert theme version does not diverge more than minor - $appVer = Str::of($appInfos->version)->explode('.'); - $themeVer = Str::of(config('theme.version'))->explode('.'); - if ( - // * Major check - Arr::get($appVer, 0) !== Arr::get($themeVer, 0) or - // * Patch check - Arr::get($appVer, 1) !== Arr::get($themeVer, 1) - ) { - Session::flash('warning', trans( - 'Ce thème n\'a semble t-il pas été vérifié pour cette version du moteur' - )); - } - // * FORCE BOOTSTRAP PAGINATOR (or custom if in front) // Early boot, request wont be filled as expected. if (collect(explode('/', \request()->getPathInfo()))->get(1) === 'bo') {