Merge pull request #3556 from GongMingCai/development

[bookstack] / app / Http / Controllers / Api / ChapterExportApiController.php

diff --git a/app/Http/Controllers/Api/ChapterExportApiController.php b/app/Http/Controllers/Api/ChapterExportApiController.php
index a4c349f4ef4aa06276adf98089531566a4c25617..faf5d812e207c667170fd8c361f4a976ee3d7f11 100644 (file)
--- a/app/Http/Controllers/Api/ChapterExportApiController.php
+++ b/app/Http/Controllers/Api/ChapterExportApiController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers\Api;
+<?php
+
+namespace BookStack\Http\Controllers\Api;
 
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Tools\ExportFormatter;
@@ -14,28 +16,33 @@ class ChapterExportApiController extends ApiController
     public function __construct(ExportFormatter $exportFormatter)
     {
         $this->exportFormatter = $exportFormatter;
+        $this->middleware('can:content-export');
     }
 
     /**
      * Export a chapter as a PDF file.
+     *
      * @throws Throwable
      */
     public function exportPdf(int $id)
     {
         $chapter = Chapter::visible()->findOrFail($id);
         $pdfContent = $this->exportFormatter->chapterToPdf($chapter);
-        return $this->downloadResponse($pdfContent, $chapter->slug . '.pdf');
+
+        return $this->download()->directly($pdfContent, $chapter->slug . '.pdf');
     }
 
     /**
      * Export a chapter as a contained HTML file.
+     *
      * @throws Throwable
      */
     public function exportHtml(int $id)
     {
         $chapter = Chapter::visible()->findOrFail($id);
         $htmlContent = $this->exportFormatter->chapterToContainedHtml($chapter);
-        return $this->downloadResponse($htmlContent, $chapter->slug . '.html');
+
+        return $this->download()->directly($htmlContent, $chapter->slug . '.html');
     }
 
     /**
@@ -45,7 +52,8 @@ class ChapterExportApiController extends ApiController
     {
         $chapter = Chapter::visible()->findOrFail($id);
         $textContent = $this->exportFormatter->chapterToPlainText($chapter);
-        return $this->downloadResponse($textContent, $chapter->slug . '.txt');
+
+        return $this->download()->directly($textContent, $chapter->slug . '.txt');
     }
 
     /**
@@ -55,6 +63,7 @@ class ChapterExportApiController extends ApiController
     {
         $chapter = Chapter::visible()->findOrFail($id);
         $markdown = $this->exportFormatter->chapterToMarkdown($chapter);
-        return $this->downloadResponse($markdown, $chapter->slug . '.md');
+
+        return $this->download()->directly($markdown, $chapter->slug . '.md');
     }
 }