diff --git a/app/Entities/Controllers/PageApiController.php b/app/Entities/Controllers/PageApiController.php index 28dd36f97..655eeeec9 100644 --- a/app/Entities/Controllers/PageApiController.php +++ b/app/Entities/Controllers/PageApiController.php @@ -13,8 +13,6 @@ use Illuminate\Http\Request; class PageApiController extends ApiController { - protected PageRepo $pageRepo; - protected $rules = [ 'create' => [ 'book_id' => ['required_without:chapter_id', 'integer'], @@ -34,9 +32,9 @@ class PageApiController extends ApiController ], ]; - public function __construct(PageRepo $pageRepo) - { - $this->pageRepo = $pageRepo; + public function __construct( + protected PageRepo $pageRepo + ) { } /** diff --git a/app/Entities/Models/Page.php b/app/Entities/Models/Page.php index 40acb9a35..7e2c12c20 100644 --- a/app/Entities/Models/Page.php +++ b/app/Entities/Models/Page.php @@ -139,6 +139,7 @@ class Page extends BookChild { $refreshed = $this->refresh()->unsetRelations()->load(['tags', 'createdBy', 'updatedBy', 'ownedBy']); $refreshed->setHidden(array_diff($refreshed->getHidden(), ['html', 'markdown'])); + $refreshed->setAttribute('raw_html', $refreshed->html); $refreshed->html = (new PageContent($refreshed))->render(); return $refreshed; diff --git a/dev/api/responses/pages-create.json b/dev/api/responses/pages-create.json index eeaa5303a..5c3d80215 100644 --- a/dev/api/responses/pages-create.json +++ b/dev/api/responses/pages-create.json @@ -5,6 +5,7 @@ "name": "My API Page", "slug": "my-api-page", "html": "
my new API page
", + "raw_html": "my new API page
", "priority": 14, "created_at": "2020-11-28T15:01:39.000000Z", "updated_at": "2020-11-28T15:01:39.000000Z", diff --git a/dev/api/responses/pages-read.json b/dev/api/responses/pages-read.json index 9a21cd44c..a47990cc6 100644 --- a/dev/api/responses/pages-read.json +++ b/dev/api/responses/pages-read.json @@ -4,7 +4,8 @@ "chapter_id": 0, "name": "A page written in markdown", "slug": "a-page-written-in-markdown", - "html": "This page is written in markdown. BookStack stores the page data in HTML.
\r\nHere's a cute picture of my cat:
\r\n", + "html": "my new API page - Updated
", + "raw_html": "my new API page - Updated
", "priority": 16, "created_at": "2020-11-28T15:10:54.000000Z", "updated_at": "2020-11-28T15:13:03.000000Z", diff --git a/tests/Api/PagesApiTest.php b/tests/Api/PagesApiTest.php index 75cc2807f..4a81f738b 100644 --- a/tests/Api/PagesApiTest.php +++ b/tests/Api/PagesApiTest.php @@ -159,6 +159,20 @@ class PagesApiTest extends TestCase $this->assertStringContainsString('testing', $html); } + public function test_read_endpoint_provides_raw_html() + { + $html = "testing