Merge branch 'issue-52' into 'develop'
fix: 🐛 slugify and decode binded url
See merge request ldc-web/projets/nature-and-respect!73
This commit is contained in:
commit
ef72b9c99a
1 changed files with 16 additions and 12 deletions
|
|
@ -19,6 +19,7 @@ use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvi
|
|||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\RateLimiter;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
use Illuminate\Support\Str;
|
||||
|
||||
class RouteServiceProvider extends ServiceProvider
|
||||
{
|
||||
|
|
@ -56,24 +57,24 @@ class RouteServiceProvider extends ServiceProvider
|
|||
|
||||
Route::bind('publishedRecipe', function ($value) use ($defaultLocale) {
|
||||
$query = Recipe::query()
|
||||
->whereHas('range', fn (Builder $q) => $q->where('status', true))
|
||||
->where('status', true);
|
||||
->whereHas('range', fn(Builder $q) => $q->where('status', true))
|
||||
->where('status', true);
|
||||
return ToolboxHelper::queryColumnWithLocales(
|
||||
$defaultLocale,
|
||||
$query,
|
||||
'slug',
|
||||
$value
|
||||
Str::slug(urldecode($value))
|
||||
)->firstOrFail();
|
||||
});
|
||||
Route::bind('publishedProduct', function ($value) use ($defaultLocale) {
|
||||
$query = Product::query()
|
||||
->whereHas('range', fn (Builder $q) => $q->where('status', true))
|
||||
->where('status', true);
|
||||
->whereHas('range', fn(Builder $q) => $q->where('status', true))
|
||||
->where('status', true);
|
||||
return ToolboxHelper::queryColumnWithLocales(
|
||||
$defaultLocale,
|
||||
$query,
|
||||
'slug',
|
||||
$value
|
||||
Str::slug(urldecode($value))
|
||||
)->firstOrFail();
|
||||
});
|
||||
Route::bind('publishedNews', function ($value) use ($defaultLocale) {
|
||||
|
|
@ -85,7 +86,7 @@ class RouteServiceProvider extends ServiceProvider
|
|||
$defaultLocale,
|
||||
$query,
|
||||
'slug',
|
||||
$value
|
||||
Str::slug(urldecode($value))
|
||||
)->firstOrFail();
|
||||
});
|
||||
|
||||
|
|
@ -137,13 +138,16 @@ class RouteServiceProvider extends ServiceProvider
|
|||
}
|
||||
// * Flatten if needed
|
||||
$cspReport = collect(request()->json('csp-report'))
|
||||
->flatMap(function ($v, $k) {
|
||||
return [$k => is_array($v) ? collect($v)->flatten()->implode(', ') : $v];
|
||||
})->all();
|
||||
->flatMap(function ($v, $k) {
|
||||
return [$k => is_array($v) ? collect($v)->flatten()->implode(', ') : $v];
|
||||
})->all();
|
||||
// * Filter array keys
|
||||
$cspReport = collect(array_intersect_key($cspReport, [
|
||||
'blocked-uri' => '', 'document-uri' => '', 'original-policy' => '',
|
||||
'referrer' => '', 'violated-directive' => ''
|
||||
'blocked-uri' => '',
|
||||
'document-uri' => '',
|
||||
'original-policy' => '',
|
||||
'referrer' => '',
|
||||
'violated-directive' => ''
|
||||
]));
|
||||
\Illuminate\Support\Facades\Log::warning(sprintf(
|
||||
"CSP REPORT for %s : \n %s",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue