Added method for using enity ownership in relation queries

[bookstack] / app / Http / Controllers / BookExportController.php

diff --git a/app/Http/Controllers/BookExportController.php b/app/Http/Controllers/BookExportController.php
index a92d94cc94f4f7a0b368dfb47b2a13f7009c8848..cc8d48a35511e5c6504c69b33512c9164fd22793 100644 (file)
--- a/app/Http/Controllers/BookExportController.php
+++ b/app/Http/Controllers/BookExportController.php
@@ -2,47 +2,49 @@
 
 namespace BookStack\Http\Controllers;
 
-use BookStack\Entities\Managers\BookContents;
-use BookStack\Entities\ExportService;
 use BookStack\Entities\Repos\BookRepo;
+use BookStack\Entities\Tools\ExportFormatter;
 use Throwable;
 
 class BookExportController extends Controller
 {
-
     protected $bookRepo;
-    protected $exportService;
+    protected $exportFormatter;
 
     /**
      * BookExportController constructor.
      */
-    public function __construct(BookRepo $bookRepo, ExportService $exportService)
+    public function __construct(BookRepo $bookRepo, ExportFormatter $exportFormatter)
     {
         $this->bookRepo = $bookRepo;
-        $this->exportService = $exportService;
-        parent::__construct();
+        $this->exportFormatter = $exportFormatter;
+        $this->middleware('can:content-export');
     }
 
     /**
      * Export a book as a PDF file.
+     *
      * @throws Throwable
      */
     public function pdf(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
-        $pdfContent = $this->exportService->bookToPdf($book);
-        return $this->downloadResponse($pdfContent, $bookSlug . '.pdf');
+        $pdfContent = $this->exportFormatter->bookToPdf($book);
+
+        return $this->download()->directly($pdfContent, $bookSlug . '.pdf');
     }
 
     /**
      * Export a book as a contained HTML file.
+     *
      * @throws Throwable
      */
     public function html(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
-        $htmlContent = $this->exportService->bookToContainedHtml($book);
-        return $this->downloadResponse($htmlContent, $bookSlug . '.html');
+        $htmlContent = $this->exportFormatter->bookToContainedHtml($book);
+
+        return $this->download()->directly($htmlContent, $bookSlug . '.html');
     }
 
     /**
@@ -51,8 +53,9 @@ class BookExportController extends Controller
     public function plainText(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
-        $textContent = $this->exportService->bookToPlainText($book);
-        return $this->downloadResponse($textContent, $bookSlug . '.txt');
+        $textContent = $this->exportFormatter->bookToPlainText($book);
+
+        return $this->download()->directly($textContent, $bookSlug . '.txt');
     }
 
     /**
@@ -61,17 +64,8 @@ class BookExportController extends Controller
     public function markdown(string $bookSlug)
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
-        $textContent = $this->exportService->bookToMarkdown($book);
-        return $this->downloadResponse($textContent, $bookSlug . '.md');
-    }
+        $textContent = $this->exportFormatter->bookToMarkdown($book);
 
-    /**
-     * Export a book as a zip file, made of markdown files.
-     */
-    public function zip(string $bookSlug)
-    {
-        $book = $this->bookRepo->getBySlug($bookSlug);
-        $filename = $this->exportService->bookToZip($book);
-        return response()->download($filename);
+        return $this->download()->directly($textContent, $bookSlug . '.md');
     }
 }