Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/Http/Middleware/EnforceExpectsJson.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

namespace Lomkit\Rest\Http\Middleware;

use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Symfony\Component\HttpFoundation\Response;

class EnforceExpectsJson
{
/**
* Handle an incoming request.
*
* @param \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response) $next
*/
public function handle(Request $request, Closure $next): Response
{
if (!Str::contains($request->header('Accept'), 'application/json')) {
$request->headers->set('Accept', 'application/json, '.$request->header('Accept'));
}

return $next($request);
}
}
6 changes: 4 additions & 2 deletions src/Rest.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Lomkit\Rest\Contracts\Http\Routing\Registrar;
use Lomkit\Rest\Documentation\Schemas\OpenAPI;
use Lomkit\Rest\Http\Controllers\Controller;
use Lomkit\Rest\Http\Middleware\EnforceExpectsJson;
use Lomkit\Rest\Http\Routing\PendingResourceRegistration;
use Lomkit\Rest\Http\Routing\ResourceRegistrar;

Expand All @@ -29,12 +30,13 @@ public function resource(string $name, string $controller, array $options = [])
$registrar = new ResourceRegistrar(app('router'));
}

return new PendingResourceRegistration(
return (new PendingResourceRegistration(
$registrar,
$name,
$controller,
$options
);
))
->middleware(EnforceExpectsJson::class);
}

/**
Expand Down