Skip to content
Merged
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
21 changes: 16 additions & 5 deletions src/Http/Middleware/CP/HandleInertiaRequests.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

namespace Statamic\Http\Middleware\CP;

use Closure;
use Illuminate\Http\Request;
use Inertia\Inertia;
use Inertia\Middleware;
use Inertia\Support\Header;
use Statamic\CP\Toasts\Manager;
use Statamic\Statamic;
use Symfony\Component\HttpFoundation\BinaryFileResponse;
Expand Down Expand Up @@ -42,13 +44,22 @@ public function share(Request $request): array
]);
}

public function onEmptyResponse(Request $request, Response $response): Response
public function handle(Request $request, Closure $next)
{
if ($response instanceof StreamedResponse || $response instanceof BinaryFileResponse) {
return Inertia::location($request->fullUrl());
}
return parent::handle($request, function ($request) use ($next) {
$response = $next($request);

if ($request->header(Header::INERTIA) && $this->isDownload($response)) {
return Inertia::location($request->fullUrl());
}

return parent::onEmptyResponse($request, $response);
return $response;
});
}

private function isDownload(Response $response): bool
{
return $response instanceof StreamedResponse || $response instanceof BinaryFileResponse;
}

private function logos()
Expand Down
Loading