From a135d8cae1fdb67f92fa405c5227c97f271bbc55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Wed, 15 Sep 2021 10:13:51 +0200 Subject: [PATCH] update AppService provider --- app/Providers/AppServiceProvider.php | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 73af49a..098590a 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -4,6 +4,8 @@ namespace App\Providers; use Illuminate\Http\Resources\Json\JsonResource; use Illuminate\Pagination\Paginator; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\URL; @@ -32,9 +34,33 @@ class AppServiceProvider extends ServiceProvider //! Important pourra etre retiré quand la V1 sera supprimé // empeche l'encapsulation dans data JsonResource::withoutWrapping(); + + // LOCAL HTTPS FIX if (!in_array(config('app.env'), ['local', 'testing'])) { URL::forceScheme('https'); } + // HA PROXY FIX + App::singleton('clientIp', function () { + if ( + config('app.env') === 'local' + ) { + return request()->getClientIp(); + } else { + return request()->server('HTTP_X_FORWARDED_FOR') ?? + request()->getClientIp(); + } + }); + // LOCAL FORCE eg: for Carbon + setlocale(LC_ALL, \sprintf( + '%s_%s.UTF-8', + config('app.locale'), + \strtoupper(config('app.locale')) + )); + Carbon::setLocale(config('app.locale')); + // FORCE BOOTSTRAP PAGINATOR + if (!app()->runningInConsole()) { + Paginator::useBootstrap(); + } Paginator::useBootstrap();