Added basic system tests for markdown editor, Added extra test helpers

[bookstack] / app / Http / Controllers / Controller.php

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index fce479af04e7d1294c2cf17eeb31b2bc40f6ec9d..f0cb47cd9197f6cfaf3b6c3441390e4ecd57be8f 100644 (file)
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -68,9 +68,8 @@ abstract class Controller extends BaseController
     protected function showPermissionError()
     {
         Session::flash('error', trans('errors.permission'));
     protected function showPermissionError()
     {
         Session::flash('error', trans('errors.permission'));

-        throw new HttpResponseException(
-            redirect('/')
-        );
+        $response = request()->wantsJson() ? response()->json(['error' => trans('errors.permissionJson')], 403) : redirect('/');
+        throw new HttpResponseException($response);

     }
 
     /**
     }
 
     /**


@@ -94,10 +93,8 @@ abstract class Controller extends BaseController
      */
     protected function checkOwnablePermission($permission, Ownable $ownable)
     {
      */
     protected function checkOwnablePermission($permission, Ownable $ownable)
     {

-        $permissionBaseName = strtolower($permission) . '-';
-        if (userCan($permissionBaseName . 'all')) return true;
-        if (userCan($permissionBaseName . 'own') && $ownable->createdBy->id === $this->currentUser->id) return true;
-        $this->showPermissionError();
+        if (userCan($permission, $ownable)) return true;
+        return $this->showPermissionError();

     }
 
     /**
     }
 
     /**