mirror of
https://github.com/InvoiceShelf/InvoiceShelf.git
synced 2026-08-05 07:32:14 +00:00
fix(pdf): give both drivers one contract, and fix what that was hiding (#727)
PdfDriver and ResponseStream existed but nothing implemented them. The factory returned the vendor dompdf wrapper for one driver and a bespoke class for the other, so the two were never held to the same shape. Three things had slipped through that gap. Report PDFs answered 403 for everyone. The five report routes carry no company header, so ScopeBouncer is not in their middleware stack and the ability scope was never set; 'view-financial-reports' is stored scoped to a company, so the check could not pass. They now scope to the company named in the URL. The policy still checks membership, so this grants nothing new. Also firstOrFail() on the hash lookup, so an unknown company is a 404 rather than a 500 on a null. Report downloads were fatal on Gotenberg. GotenbergPdfResponse had no download(), and the report controllers are its only callers. Added, alongside stream() and output(), with the whole set now on the interface. Streamed documents carried an HTTP preamble. GeneratesPdfTrait wrapped $pdf->stream() -- already a Response -- in another response()->make(), which stringified it and prepended "HTTP/1.0 200 OK" plus headers to the file. Readers scan the first kilobyte for %PDF so nobody noticed, but the bytes were malformed. Passing ->output() fixes it, and the render test now asserts the position. Two driver-parity settings, both checked against a real gotenberg:8 rather than inferred: emulateScreenMediaType(), because Chromium defaults to print media while config/dompdf.php renders as screen, so a @media print rule applied on one driver and not the other; and printBackground(), which turns out to affect only the root background, since Chromium paints element backgrounds either way. No stock template sets a body background, so that one changes nothing today and is here to keep custom templates consistent across drivers. Claude-Session: https://claude.ai/code/session_01QmECndmNZwzN65Zz9P87dF
This commit is contained in:
committed by
GitHub
parent
a8cbcda835
commit
6cb754da60
@@ -6,10 +6,23 @@ use App\Support\Net\BlockedUrlException;
|
||||
use App\Support\Net\PrivateNetworkGuard;
|
||||
use Gotenberg\Gotenberg;
|
||||
use Gotenberg\Stream;
|
||||
use Psr\Http\Message\RequestInterface;
|
||||
|
||||
class GotenbergPdfDriver
|
||||
class GotenbergPdfDriver implements PdfDriver
|
||||
{
|
||||
public function loadView(string $viewname): GotenbergPdfResponse
|
||||
public function loadView(string $template): ResponseStream
|
||||
{
|
||||
return new GotenbergPdfResponse(Gotenberg::send($this->buildRequest($template)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Assemble the Chromium request without sending it.
|
||||
*
|
||||
* Split out so the option wiring can actually be asserted on. Everything
|
||||
* below this line used to be inlined into loadView(), which meant the only
|
||||
* way to check that an option was set was to run a Gotenberg service.
|
||||
*/
|
||||
public function buildRequest(string $template): RequestInterface
|
||||
{
|
||||
$papersize = explode(' ', config('pdf.connections.gotenberg.papersize'));
|
||||
if (count($papersize) != 2) {
|
||||
@@ -32,18 +45,28 @@ class GotenbergPdfDriver
|
||||
}
|
||||
}
|
||||
|
||||
$request = Gotenberg::chromium($host)
|
||||
return Gotenberg::chromium($host)
|
||||
->pdf()
|
||||
// Only affects the root (body/html) background: Chromium paints
|
||||
// element backgrounds either way, verified against gotenberg:8, so
|
||||
// no stock template changes. dompdf does paint the body background,
|
||||
// so this is here to stop a custom template that sets one from
|
||||
// rendering differently depending on the selected driver.
|
||||
->printBackground()
|
||||
// config/dompdf.php renders as `screen`; Chromium defaults to `print`.
|
||||
// Align them so a template with media queries behaves the same either
|
||||
// way rather than depending on which driver is selected.
|
||||
->emulateScreenMediaType()
|
||||
->margins(0, 0, 0, 0)
|
||||
->paperSize($papersize[0], $papersize[1])
|
||||
->html(
|
||||
// The SDK renames this to index.html regardless of what we pass
|
||||
// (ChromiumPdf::html()), so name it that way rather than implying
|
||||
// a choice we do not have.
|
||||
Stream::string(
|
||||
'document.html',
|
||||
view($viewname)->render(),
|
||||
'index.html',
|
||||
view($template)->render(),
|
||||
)
|
||||
);
|
||||
$result = Gotenberg::send($request);
|
||||
|
||||
return new GotenbergPdfResponse($result);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user