Skip intermediate login page with single provider

[bookstack] / app / Entities / Repos / PageRepo.php

diff --git a/app/Entities/Repos/PageRepo.php b/app/Entities/Repos/PageRepo.php
index 5eb882a026a3f803369b56b06b6334c46e8773c9..c106d2fd30679d6f663cdd845ddbaf1b0aee4fe5 100644 (file)
--- a/app/Entities/Repos/PageRepo.php
+++ b/app/Entities/Repos/PageRepo.php
@@ -1,14 +1,17 @@
-<?php namespace BookStack\Entities\Repos;
+<?php
+
+namespace BookStack\Entities\Repos;

 
 use BookStack\Actions\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Entities\Models\Book;
 use BookStack\Entities\Models\Chapter;
 use BookStack\Entities\Models\Entity;

+use BookStack\Entities\Models\Page;
+use BookStack\Entities\Models\PageRevision;

 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;
 use BookStack\Entities\Tools\BookContents;
 use BookStack\Entities\Tools\PageContent;

+use BookStack\Entities\Tools\PageEditorData;

 use BookStack\Entities\Tools\TrashCan;
 use BookStack\Entities\Tools\TrashCan;

-use BookStack\Entities\Models\Page;
-use BookStack\Entities\Models\PageRevision;

 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;
 use BookStack\Exceptions\MoveOperationException;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\PermissionsException;


@@ -16,11 +19,9 @@ use BookStack\Facades\Activity;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Pagination\LengthAwarePaginator;

-use Illuminate\Support\Collection;

 
 class PageRepo
 {
 
 class PageRepo
 {

-

     protected $baseRepo;
 
     /**
     protected $baseRepo;
 
     /**


@@ -33,6 +34,7 @@ class PageRepo
 
     /**
      * Get a page by ID.
 
     /**
      * Get a page by ID.

+     *

      * @throws NotFoundException
      */
     public function getById(int $id, array $relations = ['book']): Page
      * @throws NotFoundException
      */
     public function getById(int $id, array $relations = ['book']): Page


@@ -48,6 +50,7 @@ class PageRepo
 
     /**
      * Get a page its book and own slug.
 
     /**
      * Get a page its book and own slug.

+     *

      * @throws NotFoundException
      */
     public function getBySlug(string $bookSlug, string $pageSlug): Page
      * @throws NotFoundException
      */
     public function getBySlug(string $bookSlug, string $pageSlug): Page


@@ -67,9 +70,10 @@ class PageRepo
      */
     public function getByOldSlug(string $bookSlug, string $pageSlug): ?Page
     {
      */
     public function getByOldSlug(string $bookSlug, string $pageSlug): ?Page
     {

+        /** @var ?PageRevision $revision */

         $revision = PageRevision::query()
             ->whereHas('page', function (Builder $query) {
         $revision = PageRevision::query()
             ->whereHas('page', function (Builder $query) {

-                $query->visible();
+                $query->scopes('visible');

             })
             ->where('slug', '=', $pageSlug)
             ->where('type', '=', 'version')
             })
             ->where('slug', '=', $pageSlug)
             ->where('type', '=', 'version')


@@ -77,7 +81,8 @@ class PageRepo
             ->orderBy('created_at', 'desc')
             ->with('page')
             ->first();
             ->orderBy('created_at', 'desc')
             ->with('page')
             ->first();

-        return $revision ? $revision->page : null;
+
+        return $revision->page ?? null;

     }
 
     /**
     }
 
     /**


@@ -119,6 +124,7 @@ class PageRepo
     public function getUserDraft(Page $page): ?PageRevision
     {
         $revision = $this->getUserDraftQuery($page)->first();
     public function getUserDraft(Page $page): ?PageRevision
     {
         $revision = $this->getUserDraftQuery($page)->first();

+

         return $revision;
     }
 
         return $revision;
     }
 


@@ -128,11 +134,11 @@ class PageRepo
     public function getNewDraftPage(Entity $parent)
     {
         $page = (new Page())->forceFill([
     public function getNewDraftPage(Entity $parent)
     {
         $page = (new Page())->forceFill([

-            'name' => trans('entities.pages_initial_name'),
+            'name'       => trans('entities.pages_initial_name'),

             'created_by' => user()->id,
             'created_by' => user()->id,

-            'owned_by' => user()->id,
+            'owned_by'   => user()->id,

             'updated_by' => user()->id,
             'updated_by' => user()->id,

-            'draft' => true,
+            'draft'      => true,

         ]);
 
         if ($parent instanceof Chapter) {
         ]);
 
         if ($parent instanceof Chapter) {


@@ -144,6 +150,7 @@ class PageRepo
 
         $page->save();
         $page->refresh()->rebuildPermissions();
 
         $page->save();
         $page->refresh()->rebuildPermissions();

+

         return $page;
     }
 
         return $page;
     }
 


@@ -152,8 +159,8 @@ class PageRepo
      */
     public function publishDraft(Page $draft, array $input): Page
     {
      */
     public function publishDraft(Page $draft, array $input): Page
     {

-        $this->baseRepo->update($draft, $input);

         $this->updateTemplateStatusAndContentFromInput($draft, $input);
         $this->updateTemplateStatusAndContentFromInput($draft, $input);

+        $this->baseRepo->update($draft, $input);

 
         $draft->draft = false;
         $draft->revision_count = 1;
 
         $draft->draft = false;
         $draft->revision_count = 1;


@@ -165,7 +172,8 @@ class PageRepo
         $draft->indexForSearch();
         $draft->refresh();
 
         $draft->indexForSearch();
         $draft->refresh();
 

-        Activity::addForEntity($draft, ActivityType::PAGE_CREATE);
+        Activity::add(ActivityType::PAGE_CREATE, $draft);
+

         return $draft;
     }
 
         return $draft;
     }
 


@@ -190,7 +198,7 @@ class PageRepo
         $this->getUserDraftQuery($page)->delete();
 
         // Save a revision after updating
         $this->getUserDraftQuery($page)->delete();
 
         // Save a revision after updating

-        $summary = trim($input['summary'] ?? "");
+        $summary = trim($input['summary'] ?? '');

         $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml;
         $nameChanged = isset($input['name']) && $input['name'] !== $oldName;
         $markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
         $htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml;
         $nameChanged = isset($input['name']) && $input['name'] !== $oldName;
         $markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;


@@ -198,7 +206,8 @@ class PageRepo
             $this->savePageRevision($page, $summary);
         }
 
             $this->savePageRevision($page, $summary);
         }
 

-        Activity::addForEntity($page, ActivityType::PAGE_UPDATE);
+        Activity::add(ActivityType::PAGE_UPDATE, $page);
+

         return $page;
     }
 
         return $page;
     }
 


@@ -209,10 +218,24 @@ class PageRepo
         }
 
         $pageContent = new PageContent($page);
         }
 
         $pageContent = new PageContent($page);

-        if (!empty($input['markdown'] ?? '')) {
+        $currentEditor = $page->editor ?: PageEditorData::getSystemDefaultEditor();
+        $newEditor = $currentEditor;
+
+        $haveInput = isset($input['markdown']) || isset($input['html']);
+        $inputEmpty = empty($input['markdown']) && empty($input['html']);
+
+        if ($haveInput && $inputEmpty) {
+            $pageContent->setNewHTML('');
+        } elseif (!empty($input['markdown']) && is_string($input['markdown'])) {
+            $newEditor = 'markdown';

             $pageContent->setNewMarkdown($input['markdown']);
             $pageContent->setNewMarkdown($input['markdown']);

-        } else {
-            $pageContent->setNewHTML($input['html'] ?? '');
+        } elseif (isset($input['html'])) {
+            $newEditor = 'wysiwyg';
+            $pageContent->setNewHTML($input['html']);
+        }
+
+        if ($newEditor !== $currentEditor && userCan('editor-change')) {
+            $page->editor = $newEditor;

         }
     }
 
         }
     }
 


@@ -221,8 +244,12 @@ class PageRepo
      */
     protected function savePageRevision(Page $page, string $summary = null): PageRevision
     {
      */
     protected function savePageRevision(Page $page, string $summary = null): PageRevision
     {

-        $revision = new PageRevision($page->getAttributes());
+        $revision = new PageRevision();

 
 

+        $revision->name = $page->name;
+        $revision->html = $page->html;
+        $revision->markdown = $page->markdown;
+        $revision->text = $page->text;

         $revision->page_id = $page->id;
         $revision->slug = $page->slug;
         $revision->book_slug = $page->book->slug;
         $revision->page_id = $page->id;
         $revision->slug = $page->slug;
         $revision->book_slug = $page->book->slug;


@@ -234,6 +261,7 @@ class PageRepo
         $revision->save();
 
         $this->deleteOldRevisions($page);
         $revision->save();
 
         $this->deleteOldRevisions($page);

+

         return $revision;
     }
 
         return $revision;
     }
 


@@ -244,34 +272,40 @@ class PageRepo
     {
         // If the page itself is a draft simply update that
         if ($page->draft) {
     {
         // If the page itself is a draft simply update that
         if ($page->draft) {

-            if (isset($input['html'])) {
-                (new PageContent($page))->setNewHTML($input['html']);
-            }
+            $this->updateTemplateStatusAndContentFromInput($page, $input);

             $page->fill($input);
             $page->save();
             $page->fill($input);
             $page->save();

+

             return $page;
         }
 
             return $page;
         }
 

-        // Otherwise save the data to a revision
+        // Otherwise, save the data to a revision

         $draft = $this->getPageRevisionToUpdate($page);
         $draft->fill($input);
         $draft = $this->getPageRevisionToUpdate($page);
         $draft->fill($input);

-        if (setting('app-editor') !== 'markdown') {
+
+        if (!empty($input['markdown'])) {
+            $draft->markdown = $input['markdown'];
+            $draft->html = '';
+        } else {
+            $draft->html = $input['html'];

             $draft->markdown = '';
         }
 
         $draft->save();
             $draft->markdown = '';
         }
 
         $draft->save();

+

         return $draft;
     }
 
     /**
      * Destroy a page from the system.
         return $draft;
     }
 
     /**
      * Destroy a page from the system.

+     *

      * @throws Exception
      */
     public function destroy(Page $page)
     {
         $trashCan = new TrashCan();
         $trashCan->softDestroyPage($page);
      * @throws Exception
      */
     public function destroy(Page $page)
     {
         $trashCan = new TrashCan();
         $trashCan->softDestroyPage($page);

-        Activity::addForEntity($page, ActivityType::PAGE_DELETE);
+        Activity::add(ActivityType::PAGE_DELETE, $page);

         $trashCan->autoClearOld();
     }
 
         $trashCan->autoClearOld();
     }
 


@@ -281,6 +315,8 @@ class PageRepo
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;
     public function restoreRevision(Page $page, int $revisionId): Page
     {
         $page->revision_count++;

+
+        /** @var PageRevision $revision */

         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
 
         $page->fill($revision->toArray());
         $revision = $page->revisions()->where('id', '=', $revisionId)->first();
 
         $page->fill($revision->toArray());


@@ -291,7 +327,7 @@ class PageRepo
         } else {
             $content->setNewHTML($revision->html);
         }
         } else {
             $content->setNewHTML($revision->html);
         }

-        
+

         $page->updated_by = user()->id;
         $page->refreshSlug();
         $page->save();
         $page->updated_by = user()->id;
         $page->refreshSlug();
         $page->save();


@@ -300,21 +336,23 @@ class PageRepo
         $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
         $this->savePageRevision($page, $summary);
 
         $summary = trans('entities.pages_revision_restored_from', ['id' => strval($revisionId), 'summary' => $revision->summary]);
         $this->savePageRevision($page, $summary);
 

-        Activity::addForEntity($page, ActivityType::PAGE_RESTORE);
+        Activity::add(ActivityType::PAGE_RESTORE, $page);
+

         return $page;
     }
 
     /**
      * Move the given page into a new parent book or chapter.
      * The $parentIdentifier must be a string of the following format:
         return $page;
     }
 
     /**
      * Move the given page into a new parent book or chapter.
      * The $parentIdentifier must be a string of the following format:

-     * 'book:<id>' (book:5)
+     * 'book:<id>' (book:5).
+     *

      * @throws MoveOperationException
      * @throws PermissionsException
      */
     public function move(Page $page, string $parentIdentifier): Entity
     {
         $parent = $this->findParentByIdentifier($parentIdentifier);
      * @throws MoveOperationException
      * @throws PermissionsException
      */
     public function move(Page $page, string $parentIdentifier): Entity
     {
         $parent = $this->findParentByIdentifier($parentIdentifier);

-        if ($parent === null) {
+        if (is_null($parent)) {

             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 
             throw new MoveOperationException('Book or chapter to move page into not found');
         }
 


@@ -323,56 +361,23 @@ class PageRepo
         }
 
         $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;
         }
 
         $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : null;

-        $page->changeBook($parent instanceof Book ? $parent->id : $parent->book->id);
+        $newBookId = ($parent instanceof Chapter) ? $parent->book->id : $parent->id;
+        $page->changeBook($newBookId);

         $page->rebuildPermissions();
 
         $page->rebuildPermissions();
 

-        Activity::addForEntity($page, ActivityType::PAGE_MOVE);
-        return $parent;
-    }
-
-    /**
-     * Copy an existing page in the system.
-     * Optionally providing a new parent via string identifier and a new name.
-     * @throws MoveOperationException
-     * @throws PermissionsException
-     */
-    public function copy(Page $page, string $parentIdentifier = null, string $newName = null): Page
-    {
-        $parent = $parentIdentifier ? $this->findParentByIdentifier($parentIdentifier) : $page->getParent();
-        if ($parent === null) {
-            throw new MoveOperationException('Book or chapter to move page into not found');
-        }
-
-        if (!userCan('page-create', $parent)) {
-            throw new PermissionsException('User does not have permission to create a page within the new parent');
-        }
-
-        $copyPage = $this->getNewDraftPage($parent);
-        $pageData = $page->getAttributes();
-
-        // Update name
-        if (!empty($newName)) {
-            $pageData['name'] = $newName;
-        }
+        Activity::add(ActivityType::PAGE_MOVE, $page);

 
 

-        // Copy tags from previous page if set
-        if ($page->tags) {
-            $pageData['tags'] = [];
-            foreach ($page->tags as $tag) {
-                $pageData['tags'][] = ['name' => $tag->name, 'value' => $tag->value];
-            }
-        }
-
-        return $this->publishDraft($copyPage, $pageData);
+        return $parent;

     }
 
     /**
     }
 
     /**

-     * Find a page parent entity via a identifier string in the format:
+     * Find a page parent entity via an identifier string in the format:

      * {type}:{id}
      * {type}:{id}

-     * Example: (book:5)
+     * Example: (book:5).
+     *

      * @throws MoveOperationException
      */
      * @throws MoveOperationException
      */

-    protected function findParentByIdentifier(string $identifier): ?Entity
+    public function findParentByIdentifier(string $identifier): ?Entity

     {
         $stringExploded = explode(':', $identifier);
         $entityType = $stringExploded[0];
     {
         $stringExploded = explode(':', $identifier);
         $entityType = $stringExploded[0];


@@ -383,6 +388,7 @@ class PageRepo
         }
 
         $parentClass = $entityType === 'book' ? Book::class : Chapter::class;
         }
 
         $parentClass = $entityType === 'book' ? Book::class : Chapter::class;

+

         return $parentClass::visible()->where('id', '=', $entityId)->first();
     }
 
         return $parentClass::visible()->where('id', '=', $entityId)->first();
     }
 


@@ -391,7 +397,7 @@ class PageRepo
      */
     protected function changeParent(Page $page, Entity $parent)
     {
      */
     protected function changeParent(Page $page, Entity $parent)
     {

-        $book = ($parent instanceof Book) ? $parent : $parent->book;
+        $book = ($parent instanceof Chapter) ? $parent->book : $parent;

         $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : 0;
         $page->save();
 
         $page->chapter_id = ($parent instanceof Chapter) ? $parent->id : 0;
         $page->save();
 


@@ -420,6 +426,7 @@ class PageRepo
         $draft->book_slug = $page->book->slug;
         $draft->created_by = user()->id;
         $draft->type = 'update_draft';
         $draft->book_slug = $page->book->slug;
         $draft->created_by = user()->id;
         $draft->type = 'update_draft';

+

         return $draft;
     }
 
         return $draft;
     }
 


@@ -445,13 +452,15 @@ class PageRepo
     }
 
     /**
     }
 
     /**

-     * Get a new priority for a page
+     * Get a new priority for a page.

      */
     protected function getNewPriority(Page $page): int
     {
         $parent = $page->getParent();
         if ($parent instanceof Chapter) {
      */
     protected function getNewPriority(Page $page): int
     {
         $parent = $page->getParent();
         if ($parent instanceof Chapter) {

+            /** @var ?Page $lastPage */

             $lastPage = $parent->pages('desc')->first();
             $lastPage = $parent->pages('desc')->first();

+

             return $lastPage ? $lastPage->priority + 1 : 0;
         }
 
             return $lastPage ? $lastPage->priority + 1 : 0;
         }