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 654fed5380af518e538b0c3850f0634b784a729f..f0cb47cd9197f6cfaf3b6c3441390e4ecd57be8f 100644 (file)
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

+use BookStack\Ownable;

 use HttpRequestException;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Http\Exception\HttpResponseException;
 use HttpRequestException;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Http\Exception\HttpResponseException;


@@ -61,33 +62,41 @@ abstract class Controller extends BaseController
     }
 
     /**
     }
 
     /**

-     * On a permission error redirect to home and display
+     * On a permission error redirect to home and display.

      * the error as a notification.
      */
     protected function showPermissionError()
     {
         Session::flash('error', trans('errors.permission'));
      * the error as a notification.
      */
     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);

     }
 
     /**
      * Checks for a permission.
     }
 
     /**
      * Checks for a permission.

-     *
-     * @param $permissionName
+     * @param string $permissionName

      * @return bool|\Illuminate\Http\RedirectResponse
      */
     protected function checkPermission($permissionName)
     {
         if (!$this->currentUser || !$this->currentUser->can($permissionName)) {
      * @return bool|\Illuminate\Http\RedirectResponse
      */
     protected function checkPermission($permissionName)
     {
         if (!$this->currentUser || !$this->currentUser->can($permissionName)) {

-            dd($this->currentUser);

             $this->showPermissionError();
         }
             $this->showPermissionError();
         }

-

         return true;
     }
 
         return true;
     }
 

+    /**
+     * Check the current user's permissions against an ownable item.
+     * @param $permission
+     * @param Ownable $ownable
+     * @return bool
+     */
+    protected function checkOwnablePermission($permission, Ownable $ownable)
+    {
+        if (userCan($permission, $ownable)) return true;
+        return $this->showPermissionError();
+    }
+

     /**
      * Check if a user has a permission or bypass if the callback is true.
      * @param $permissionName
     /**
      * Check if a user has a permission or bypass if the callback is true.
      * @param $permissionName