Code cleanup, bug squashing

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

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 2b6c88fe0b73748ab5cbdf61a64138dcdc4d5c49..758c85dda4772b094a1abd50947cebc2d3e20238 100644 (file)
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -2,63 +2,43 @@
 
 namespace BookStack\Http\Controllers;
 
 
 namespace BookStack\Http\Controllers;
 

+use BookStack\Facades\Activity;
+use BookStack\Interfaces\Loggable;

 use BookStack\Ownable;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use BookStack\Ownable;
 use Illuminate\Foundation\Bus\DispatchesJobs;

-use Illuminate\Http\Exception\HttpResponseException;
-use Illuminate\Http\Request;
-use Illuminate\Routing\Controller as BaseController;

 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Validation\ValidatesRequests;

-use BookStack\User;
+use Illuminate\Http\Exceptions\HttpResponseException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Response;
+use Illuminate\Routing\Controller as BaseController;

 
 abstract class Controller extends BaseController
 {
     use DispatchesJobs, ValidatesRequests;
 
     /**
 
 abstract class Controller extends BaseController
 {
     use DispatchesJobs, ValidatesRequests;
 
     /**

-     * @var User static
-     */
-    protected $currentUser;
-    /**
-     * @var bool
-     */
-    protected $signedIn;
-
-    /**
-     * Controller constructor.
+     * Check if the current user is signed in.

      */
      */

-    public function __construct()
+    protected function isSignedIn(): bool

     {
     {

-        $this->middleware(function ($request, $next) {
-
-            // Get a user instance for the current user
-            $user = user();
-
-            // Share variables with controllers
-            $this->currentUser = $user;
-            $this->signedIn = auth()->check();
-
-            // Share variables with views
-            view()->share('signedIn', $this->signedIn);
-            view()->share('currentUser', $user);
-
-            return $next($request);
-        });
+        return auth()->check();

     }
 
     /**
      * Stops the application and shows a permission error if
      * the application is in demo mode.
      */
     }
 
     /**
      * Stops the application and shows a permission error if
      * the application is in demo mode.
      */

-    protected function preventAccessForDemoUsers()
+    protected function preventAccessInDemoMode()

     {
     {

-        if (config('app.env') === 'demo') $this->showPermissionError();
+        if (config('app.env') === 'demo') {
+            $this->showPermissionError();
+        }

     }
 
     /**
      * Adds the page title into the view.
     }
 
     /**
      * Adds the page title into the view.

-     * @param $title

      */
      */

-    public function setPageTitle($title)
+    public function setPageTitle(string $title)

     {
         view()->share('pageTitle', $title);
     }
     {
         view()->share('pageTitle', $title);
     }


@@ -73,77 +53,111 @@ abstract class Controller extends BaseController
             $response = response()->json(['error' => trans('errors.permissionJson')], 403);
         } else {
             $response = redirect('/');
             $response = response()->json(['error' => trans('errors.permissionJson')], 403);
         } else {
             $response = redirect('/');

-            session()->flash('error', trans('errors.permission'));
+            $this->showErrorNotification(trans('errors.permission'));

         }
 
         throw new HttpResponseException($response);
     }
 
     /**
         }
 
         throw new HttpResponseException($response);
     }
 
     /**

-     * Checks for a permission.
-     * @param string $permissionName
-     * @return bool|\Illuminate\Http\RedirectResponse
+     * Checks that the current user has the given permission otherwise throw an exception.
+     */
+    protected function checkPermission(string $permission): void
+    {
+        if (!user() || !user()->can($permission)) {
+            $this->showPermissionError();
+        }
+    }
+
+    /**
+     * Check the current user's permissions against an ownable item otherwise throw an exception.

      */
      */

-    protected function checkPermission($permissionName)
+    protected function checkOwnablePermission(string $permission, Ownable $ownable): void

     {
     {

-        if (!user() || !user()->can($permissionName)) {
+        if (!userCan($permission, $ownable)) {

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

-        return true;

     }
 
     /**
     }
 
     /**

-     * Check the current user's permissions against an ownable item.
-     * @param $permission
-     * @param Ownable $ownable
-     * @return bool
+     * Check if a user has a permission or bypass the permission
+     * check if the given callback resolves true.

      */
      */

-    protected function checkOwnablePermission($permission, Ownable $ownable)
+    protected function checkPermissionOr(string $permission, callable $callback): void

     {
     {

-        if (userCan($permission, $ownable)) return true;
-        return $this->showPermissionError();
+        if ($callback() !== true) {
+            $this->checkPermission($permission);
+        }

     }
 
     /**
     }
 
     /**

-     * Check if a user has a permission or bypass if the callback is true.
-     * @param $permissionName
-     * @param $callback
-     * @return bool
+     * Check if the current user has a permission or bypass if the provided user
+     * id matches the current user.

      */
      */

-    protected function checkPermissionOr($permissionName, $callback)
+    protected function checkPermissionOrCurrentUser(string $permission, int $userId): void

     {
     {

-        $callbackResult = $callback();
-        if ($callbackResult === false) $this->checkPermission($permissionName);
-        return true;
+        $this->checkPermissionOr($permission, function () use ($userId) {
+            return $userId === user()->id;
+        });

     }
 
     /**
      * Send back a json error message.
     }
 
     /**
      * Send back a json error message.

-     * @param string $messageText
-     * @param int $statusCode
-     * @return mixed

      */
      */

-    protected function jsonError($messageText = "", $statusCode = 500)
+    protected function jsonError(string $messageText = "", int $statusCode = 500): JsonResponse

     {
     {

-        return response()->json(['message' => $messageText], $statusCode);
+        return response()->json(['message' => $messageText, 'status' => 'error'], $statusCode);

     }
 
     /**
     }
 
     /**

-     * Create the response for when a request fails validation.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  array  $errors
-     * @return \Symfony\Component\HttpFoundation\Response
+     * Create a response that forces a download in the browser.

      */
      */

-    protected function buildFailedValidationResponse(Request $request, array $errors)
+    protected function downloadResponse(string $content, string $fileName): Response

     {
     {

-        if ($request->expectsJson()) {
-            return response()->json(['validation' => $errors], 422);
-        }
+        return response()->make($content, 200, [
+            'Content-Type'        => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="' . $fileName . '"'
+        ]);
+    }
+
+    /**
+     * Show a positive, successful notification to the user on next view load.
+     */
+    protected function showSuccessNotification(string $message): void
+    {
+        session()->flash('success', $message);
+    }

 
 

-        return redirect()->to($this->getRedirectUrl())
-            ->withInput($request->input())
-            ->withErrors($errors, $this->errorBag());
+    /**
+     * Show a warning notification to the user on next view load.
+     */
+    protected function showWarningNotification(string $message): void
+    {
+        session()->flash('warning', $message);

     }
 
     }
 

+    /**
+     * Show an error notification to the user on next view load.
+     */
+    protected function showErrorNotification(string $message): void
+    {
+        session()->flash('error', $message);
+    }
+
+    /**
+     * Log an activity in the system.
+     * @param string|Loggable
+     */
+    protected function logActivity(string $type, $detail = ''): void
+    {
+        Activity::add($type, $detail);
+    }
+
+    /**
+     * Get the validation rules for image files.
+     */
+    protected function getImageValidationRules(): string
+    {
+        return 'image_extension|no_double_extension|mimes:jpeg,png,gif,webp';
+    }

 }
 }