Skip to content

Fixed an error in setting requests for exceptions #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2024
Merged

Fixed an error in setting requests for exceptions #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 13 additions & 3 deletions src/Middlewares/SetHeaderMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
namespace DragonCode\LaravelJsonResponse\Middlewares;

use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Str;
use Lmc\HttpConstants\Header;

class SetHeaderMiddleware
{
public function handle(Request $request, Closure $next)
public function handle($request, Closure $next)
{
return $this->set(
$next($this->set($request))
Expand All @@ -19,10 +19,20 @@ public function handle(Request $request, Closure $next)

protected function set($request)
{
if (! $request->headers->has(Header::ACCEPT)) {
if (!$this->hasHeader($request) || $this->isAsterisk($request)) {
$request->headers->set(Header::ACCEPT, 'application/json');
}

return $request;
}

protected function hasHeader($request): bool
{
return $request->headers->has(Header::ACCEPT);
}

protected function isAsterisk($request): bool
{
return Str::contains($request->headers->get(Header::ACCEPT, ''), '*/*');
}
}