From b4ebf0549f4ae7fa9bb1c498a5e490c765574df5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Tue, 8 Mar 2022 09:45:55 +0100 Subject: [PATCH] App usual fix in app service provider --- app/Providers/AppServiceProvider.php | 32 ++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index cecfc11..5e2f27d 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,7 +3,9 @@ namespace App\Providers; use Illuminate\Support\ServiceProvider; -use Illuminate\Http\Request; +use Illuminate\Support\Carbon; +use Illuminate\Support\Facades\App; +use Illuminate\Support\Facades\URL; class AppServiceProvider extends ServiceProvider { @@ -21,15 +23,27 @@ class AppServiceProvider extends ServiceProvider * * @return void */ - public function boot(Request $request) + public function boot() { - $proxy_url = env('PROXY_URL'); - $host = $request->getHost(); - if ($this->app->environment('dev')) { - \URL::forceScheme('https'); - } elseif ($this->app->environment('production')) { - \URL::forceRootUrl($proxy_url); - \URL::forceScheme('https'); + // * 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')); } }