From 1a9f6764164cb730399a47969d1c33099f1682b8 Mon Sep 17 00:00:00 2001 From: Dan Brown Date: Sun, 25 Mar 2018 11:34:42 +0100 Subject: [PATCH] Updated create routes to prevent slug clashes Fixes #758 --- resources/views/books/create.blade.php | 2 +- resources/views/books/index.blade.php | 4 +- resources/views/books/show.blade.php | 8 ++-- resources/views/chapters/create.blade.php | 6 +-- resources/views/chapters/form.blade.php | 2 +- resources/views/pages/guest-create.blade.php | 2 +- routes/web.php | 12 +++--- tests/Entity/EntityTest.php | 6 +-- tests/Entity/PageDraftTest.php | 4 +- tests/Permissions/RestrictionsTest.php | 16 +++---- tests/Permissions/RolesTest.php | 44 +++++++++----------- 11 files changed, 51 insertions(+), 55 deletions(-) diff --git a/resources/views/books/create.blade.php b/resources/views/books/create.blade.php index eb0664ad8..a86cb3352 100644 --- a/resources/views/books/create.blade.php +++ b/resources/views/books/create.blade.php @@ -5,7 +5,7 @@
@icon('book'){{ trans('entities.books') }} » - @icon('add'){{ trans('entities.books_create') }} + @icon('add'){{ trans('entities.books_create') }}
@stop diff --git a/resources/views/books/index.blade.php b/resources/views/books/index.blade.php index d66612f62..d1435ab66 100644 --- a/resources/views/books/index.blade.php +++ b/resources/views/books/index.blade.php @@ -18,7 +18,7 @@
@if($currentUser->can('book-create-all')) - @icon('add'){{ trans('entities.books_create') }} + @icon('add'){{ trans('entities.books_create') }} @endif
@@ -78,7 +78,7 @@ @else

{{ trans('entities.books_empty') }}

@if(userCan('books-create-all')) - @icon('edit'){{ trans('entities.create_one_now') }} + @icon('edit'){{ trans('entities.create_one_now') }} @endif @endif diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php index bb5189187..d3a51cb3a 100644 --- a/resources/views/books/show.blade.php +++ b/resources/views/books/show.blade.php @@ -15,10 +15,10 @@ @if(userCan('page-create', $book)) - @icon('add'){{ trans('entities.pages_new') }} + @icon('add'){{ trans('entities.pages_new') }} @endif @if(userCan('chapter-create', $book)) - @icon('add'){{ trans('entities.chapters_new') }} + @icon('add'){{ trans('entities.chapters_new') }} @endif @if(userCan('book-update', $book) || userCan('restrictions-manage', $book) || userCan('book-delete', $book))
@@ -111,13 +111,13 @@

{{ trans('entities.books_empty_contents') }}

@if(userCan('page-create', $book)) - @icon('page'){{ trans('entities.books_empty_create_page') }} + @icon('page'){{ trans('entities.books_empty_create_page') }} @endif @if(userCan('page-create', $book) && userCan('chapter-create', $book))   -{{ trans('entities.books_empty_or') }}-    @endif @if(userCan('chapter-create', $book)) - @icon('chapter'){{ trans('entities.books_empty_add_chapter') }} + @icon('chapter'){{ trans('entities.books_empty_add_chapter') }} @endif
@endif diff --git a/resources/views/chapters/create.blade.php b/resources/views/chapters/create.blade.php index 37f4ff633..9930da605 100644 --- a/resources/views/chapters/create.blade.php +++ b/resources/views/chapters/create.blade.php @@ -3,9 +3,9 @@ @section('toolbar')
- @icon('book'){{ $book->getShortName() }} + @icon('book'){{ $book->getShortName() }} » - @icon('add'){{ trans('entities.chapters_create') }} + @icon('add'){{ trans('entities.chapters_create') }}
@stop @@ -16,7 +16,7 @@

@icon('add') {{ trans('entities.chapters_create') }}

-
+ @include('chapters/form')
diff --git a/resources/views/chapters/form.blade.php b/resources/views/chapters/form.blade.php index 9e3b8e472..19cf65a61 100644 --- a/resources/views/chapters/form.blade.php +++ b/resources/views/chapters/form.blade.php @@ -12,6 +12,6 @@
- {{ trans('common.cancel') }} + {{ trans('common.cancel') }}
diff --git a/resources/views/pages/guest-create.blade.php b/resources/views/pages/guest-create.blade.php index 10e16cb97..c5ad8ce70 100644 --- a/resources/views/pages/guest-create.blade.php +++ b/resources/views/pages/guest-create.blade.php @@ -4,7 +4,7 @@

{{ trans('entities.pages_new') }}

-
+ {!! csrf_field() !!} diff --git a/routes/web.php b/routes/web.php index da80125b7..7a8634ca3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,11 +14,11 @@ Route::group(['middleware' => 'auth'], function () { Route::get('/recently-updated', 'PageController@showRecentlyUpdated'); }); + Route::get('/create-book', 'BookController@create'); Route::group(['prefix' => 'books'], function () { // Books Route::get('/', 'BookController@index'); - Route::get('/create', 'BookController@create'); Route::post('/', 'BookController@store'); Route::get('/{slug}/edit', 'BookController@edit'); Route::put('/{slug}', 'BookController@update'); @@ -35,8 +35,8 @@ Route::group(['middleware' => 'auth'], function () { Route::get('/{bookSlug}/export/plaintext', 'BookController@exportPlainText'); // Pages - Route::get('/{bookSlug}/page/create', 'PageController@create'); - Route::post('/{bookSlug}/page/create/guest', 'PageController@createAsGuest'); + Route::get('/{bookSlug}/create-page', 'PageController@create'); + Route::post('/{bookSlug}/create-guest-page', 'PageController@createAsGuest'); Route::get('/{bookSlug}/draft/{pageId}', 'PageController@editDraft'); Route::post('/{bookSlug}/draft/{pageId}', 'PageController@store'); Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show'); @@ -62,9 +62,9 @@ Route::group(['middleware' => 'auth'], function () { // Chapters Route::get('/{bookSlug}/chapter/{chapterSlug}/create-page', 'PageController@create'); - Route::post('/{bookSlug}/chapter/{chapterSlug}/page/create/guest', 'PageController@createAsGuest'); - Route::get('/{bookSlug}/chapter/create', 'ChapterController@create'); - Route::post('/{bookSlug}/chapter/create', 'ChapterController@store'); + Route::post('/{bookSlug}/chapter/{chapterSlug}/create-guest-page', 'PageController@createAsGuest'); + Route::get('/{bookSlug}/create-chapter', 'ChapterController@create'); + Route::post('/{bookSlug}/create-chapter', 'ChapterController@store'); Route::get('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@show'); Route::put('/{bookSlug}/chapter/{chapterSlug}', 'ChapterController@update'); Route::get('/{bookSlug}/chapter/{chapterSlug}/move', 'ChapterController@showMove'); diff --git a/tests/Entity/EntityTest.php b/tests/Entity/EntityTest.php index 4d4e0e6cd..352af1e42 100644 --- a/tests/Entity/EntityTest.php +++ b/tests/Entity/EntityTest.php @@ -139,7 +139,7 @@ class EntityTest extends BrowserKitTest // Navigate to chapter create page ->visit($book->getUrl()) ->click('New Chapter') - ->seePageIs($book->getUrl() . '/chapter/create') + ->seePageIs($book->getUrl() . '/create-chapter') // Fill out form ->type($chapter->name, '#name') ->type($chapter->description, '#description') @@ -161,7 +161,7 @@ class EntityTest extends BrowserKitTest ->visit('/books') // Choose to create a book ->click('Create New Book') - ->seePageIs('/books/create') + ->seePageIs('/create-book') // Fill out form & save ->type($book->name, '#name') ->type($book->description, '#description') @@ -172,7 +172,7 @@ class EntityTest extends BrowserKitTest // Ensure duplicate names are given different slugs $this->asAdmin() - ->visit('/books/create') + ->visit('/create-book') ->type($book->name, '#name') ->type($book->description, '#description') ->press('Save Book'); diff --git a/tests/Entity/PageDraftTest.php b/tests/Entity/PageDraftTest.php index b8ac9d3ae..d9341ace6 100644 --- a/tests/Entity/PageDraftTest.php +++ b/tests/Entity/PageDraftTest.php @@ -70,7 +70,7 @@ class PageDraftTest extends BrowserKitTest $book = \BookStack\Book::first(); $this->asAdmin()->visit('/') ->dontSeeInElement('#recent-drafts', 'New Page') - ->visit($book->getUrl() . '/page/create') + ->visit($book->getUrl() . '/create-page') ->visit('/') ->seeInElement('#recent-drafts', 'New Page'); } @@ -82,7 +82,7 @@ class PageDraftTest extends BrowserKitTest $newUser = $this->getEditor(); $this->actingAs($newUser)->visit('/') - ->visit($book->getUrl() . '/page/create') + ->visit($book->getUrl() . '/create-page') ->visit($chapter->getUrl() . '/create-page') ->visit($book->getUrl()) ->seeInElement('.page-list', 'New Page'); diff --git a/tests/Permissions/RestrictionsTest.php b/tests/Permissions/RestrictionsTest.php index 8f37b2517..433ae7ff9 100644 --- a/tests/Permissions/RestrictionsTest.php +++ b/tests/Permissions/RestrictionsTest.php @@ -109,21 +109,21 @@ class RestrictionsTest extends BrowserKitTest $this->setEntityRestrictions($book, ['view', 'delete', 'update']); - $this->forceVisit($bookUrl . '/chapter/create') + $this->forceVisit($bookUrl . '/create-chapter') ->see('You do not have permission')->seePageIs('/'); - $this->forceVisit($bookUrl . '/page/create') + $this->forceVisit($bookUrl . '/create-page') ->see('You do not have permission')->seePageIs('/'); $this->visit($bookUrl)->dontSeeInElement('.action-buttons', 'New Page') ->dontSeeInElement('.action-buttons', 'New Chapter'); $this->setEntityRestrictions($book, ['view', 'create']); - $this->visit($bookUrl . '/chapter/create') + $this->visit($bookUrl . '/create-chapter') ->type('test chapter', 'name') ->type('test description for chapter', 'description') ->press('Save Chapter') ->seePageIs($bookUrl . '/chapter/test-chapter'); - $this->visit($bookUrl . '/page/create') + $this->visit($bookUrl . '/create-page') ->type('test page', 'name') ->type('test content', 'html') ->press('Save Page') @@ -454,21 +454,21 @@ class RestrictionsTest extends BrowserKitTest $this->setEntityRestrictions($book, ['view', 'delete', 'update']); - $this->forceVisit($bookUrl . '/chapter/create') + $this->forceVisit($bookUrl . '/create-chapter') ->see('You do not have permission')->seePageIs('/'); - $this->forceVisit($bookUrl . '/page/create') + $this->forceVisit($bookUrl . '/create-page') ->see('You do not have permission')->seePageIs('/'); $this->visit($bookUrl)->dontSeeInElement('.action-buttons', 'New Page') ->dontSeeInElement('.action-buttons', 'New Chapter'); $this->setEntityRestrictions($book, ['view', 'create']); - $this->visit($bookUrl . '/chapter/create') + $this->visit($bookUrl . '/create-chapter') ->type('test chapter', 'name') ->type('test description for chapter', 'description') ->press('Save Chapter') ->seePageIs($bookUrl . '/chapter/test-chapter'); - $this->visit($bookUrl . '/page/create') + $this->visit($bookUrl . '/create-page') ->type('test page', 'name') ->type('test content', 'html') ->press('Save Page') diff --git a/tests/Permissions/RolesTest.php b/tests/Permissions/RolesTest.php index bd9e01d45..5bc66986b 100644 --- a/tests/Permissions/RolesTest.php +++ b/tests/Permissions/RolesTest.php @@ -214,12 +214,12 @@ class RolesTest extends BrowserKitTest public function test_books_create_all_permissions() { $this->checkAccessPermission('book-create-all', [ - '/books/create' + '/create-book' ], [ '/books' => 'Create New Book' ]); - $this->visit('/books/create') + $this->visit('/create-book') ->type('test book', 'name') ->type('book desc', 'description') ->press('Save Book') @@ -293,40 +293,38 @@ class RolesTest extends BrowserKitTest { $book = \BookStack\Book::take(1)->get()->first(); $ownBook = $this->createEntityChainBelongingToUser($this->user)['book']; - $baseUrl = $ownBook->getUrl() . '/chapter'; $this->checkAccessPermission('chapter-create-own', [ - $baseUrl . '/create' + $ownBook->getUrl('/create-chapter') ], [ $ownBook->getUrl() => 'New Chapter' ]); - $this->visit($baseUrl . '/create') + $this->visit($ownBook->getUrl('/create-chapter')) ->type('test chapter', 'name') ->type('chapter desc', 'description') ->press('Save Chapter') - ->seePageIs($baseUrl . '/test-chapter'); + ->seePageIs($ownBook->getUrl('/chapter/test-chapter')); $this->visit($book->getUrl()) ->dontSeeInElement('.action-buttons', 'New Chapter') - ->visit($book->getUrl() . '/chapter/create') + ->visit($book->getUrl('/create-chapter')) ->seePageIs('/'); } public function test_chapter_create_all_permissions() { $book = \BookStack\Book::take(1)->get()->first(); - $baseUrl = $book->getUrl() . '/chapter'; $this->checkAccessPermission('chapter-create-all', [ - $baseUrl . '/create' + $book->getUrl('/create-chapter') ], [ $book->getUrl() => 'New Chapter' ]); - $this->visit($baseUrl . '/create') + $this->visit($book->getUrl('/create-chapter')) ->type('test chapter', 'name') ->type('chapter desc', 'description') ->press('Save Chapter') - ->seePageIs($baseUrl . '/test-chapter'); + ->seePageIs($book->getUrl('/chapter/test-chapter')); } public function test_chapter_edit_own_permission() @@ -403,10 +401,8 @@ class RolesTest extends BrowserKitTest $ownBook = $entities['book']; $ownChapter = $entities['chapter']; - $baseUrl = $ownBook->getUrl() . '/page'; - - $createUrl = $baseUrl . '/create'; - $createUrlChapter = $ownChapter->getUrl() . '/create-page'; + $createUrl = $ownBook->getUrl('/create-page'); + $createUrlChapter = $ownChapter->getUrl('/create-page'); $accessUrls = [$createUrl, $createUrlChapter]; foreach ($accessUrls as $url) { @@ -427,15 +423,15 @@ class RolesTest extends BrowserKitTest $this->seePageIs($expectedUrl); } - $this->visit($baseUrl . '/create') + $this->visit($createUrl) ->type('test page', 'name') ->type('page desc', 'html') ->press('Save Page') - ->seePageIs($baseUrl . '/test-page'); + ->seePageIs($ownBook->getUrl('/page/test-page')); $this->visit($book->getUrl()) ->dontSeeInElement('.action-buttons', 'New Page') - ->visit($book->getUrl() . '/page/create') + ->visit($book->getUrl() . '/create-page') ->seePageIs('/'); $this->visit($chapter->getUrl()) ->dontSeeInElement('.action-buttons', 'New Page') @@ -448,9 +444,9 @@ class RolesTest extends BrowserKitTest $book = \BookStack\Book::take(1)->get()->first(); $chapter = \BookStack\Chapter::take(1)->get()->first(); $baseUrl = $book->getUrl() . '/page'; - $createUrl = $baseUrl . '/create'; + $createUrl = $book->getUrl('/create-page'); - $createUrlChapter = $chapter->getUrl() . '/create-page'; + $createUrlChapter = $chapter->getUrl('/create-page'); $accessUrls = [$createUrl, $createUrlChapter]; foreach ($accessUrls as $url) { @@ -471,17 +467,17 @@ class RolesTest extends BrowserKitTest $this->seePageIs($expectedUrl); } - $this->visit($baseUrl . '/create') + $this->visit($createUrl) ->type('test page', 'name') ->type('page desc', 'html') ->press('Save Page') - ->seePageIs($baseUrl . '/test-page'); + ->seePageIs($book->getUrl('/page/test-page')); - $this->visit($chapter->getUrl() . '/create-page') + $this->visit($chapter->getUrl('/create-page')) ->type('new test page', 'name') ->type('page desc', 'html') ->press('Save Page') - ->seePageIs($baseUrl . '/new-test-page'); + ->seePageIs($book->getUrl('/page/new-test-page')); } public function test_page_edit_own_permission()