Added tests to cover convert functionality

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

diff --git a/app/Http/Controllers/Api/PageExportApiController.php b/app/Http/Controllers/Api/PageExportApiController.php
index bf43016c2258d137d33fc6248d3b4021330e0c27..f2edffba3d8b8934175705ada9a4327d2d0724b4 100644 (file)
--- a/app/Http/Controllers/Api/PageExportApiController.php
+++ b/app/Http/Controllers/Api/PageExportApiController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers\Api;
+<?php
+
+namespace BookStack\Http\Controllers\Api;

 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\ExportFormatter;
 
 use BookStack\Entities\Models\Page;
 use BookStack\Entities\Tools\ExportFormatter;


@@ -11,28 +13,33 @@ class PageExportApiController extends ApiController
     public function __construct(ExportFormatter $exportFormatter)
     {
         $this->exportFormatter = $exportFormatter;
     public function __construct(ExportFormatter $exportFormatter)
     {
         $this->exportFormatter = $exportFormatter;

+        $this->middleware('can:content-export');

     }
 
     /**
      * Export a page as a PDF file.
     }
 
     /**
      * Export a page as a PDF file.

+     *

      * @throws Throwable
      */
     public function exportPdf(int $id)
     {
         $page = Page::visible()->findOrFail($id);
         $pdfContent = $this->exportFormatter->pageToPdf($page);
      * @throws Throwable
      */
     public function exportPdf(int $id)
     {
         $page = Page::visible()->findOrFail($id);
         $pdfContent = $this->exportFormatter->pageToPdf($page);

-        return $this->downloadResponse($pdfContent, $page->slug . '.pdf');
+
+        return $this->download()->directly($pdfContent, $page->slug . '.pdf');

     }
 
     /**
      * Export a page as a contained HTML file.
     }
 
     /**
      * Export a page as a contained HTML file.

+     *

      * @throws Throwable
      */
     public function exportHtml(int $id)
     {
         $page = Page::visible()->findOrFail($id);
         $htmlContent = $this->exportFormatter->pageToContainedHtml($page);
      * @throws Throwable
      */
     public function exportHtml(int $id)
     {
         $page = Page::visible()->findOrFail($id);
         $htmlContent = $this->exportFormatter->pageToContainedHtml($page);

-        return $this->downloadResponse($htmlContent, $page->slug . '.html');
+
+        return $this->download()->directly($htmlContent, $page->slug . '.html');

     }
 
     /**
     }
 
     /**


@@ -42,7 +49,8 @@ class PageExportApiController extends ApiController
     {
         $page = Page::visible()->findOrFail($id);
         $textContent = $this->exportFormatter->pageToPlainText($page);
     {
         $page = Page::visible()->findOrFail($id);
         $textContent = $this->exportFormatter->pageToPlainText($page);

-        return $this->downloadResponse($textContent, $page->slug . '.txt');
+
+        return $this->download()->directly($textContent, $page->slug . '.txt');

     }
 
     /**
     }
 
     /**


@@ -52,6 +60,7 @@ class PageExportApiController extends ApiController
     {
         $page = Page::visible()->findOrFail($id);
         $markdown = $this->exportFormatter->pageToMarkdown($page);
     {
         $page = Page::visible()->findOrFail($id);
         $markdown = $this->exportFormatter->pageToMarkdown($page);

-        return $this->downloadResponse($markdown, $page->slug . '.md');
+
+        return $this->download()->directly($markdown, $page->slug . '.md');

     }
 }
     }
 }