Guest control: Cleaned methods involved in fetching/handling

[bookstack] / app / App / helpers.php

diff --git a/app/App/helpers.php b/app/App/helpers.php
index 00d3e9243d7288096d39f91af5200212bb532316..b59a63448340d716fd5a24e5b2328f2c2b7d273e 100644 (file)
--- a/app/App/helpers.php
+++ b/app/App/helpers.php
@@ -35,23 +35,7 @@ function versioned_asset(string $file = ''): string
  */
 function user(): User
 {
-    return auth()->user() ?: User::getDefault();
-}
-
-/**
- * Check if current user is a signed in user.
- */
-function signedInUser(): bool
-{
-    return auth()->user() && !auth()->user()->isDefault();
-}
-
-/**
- * Check if the current user has general access.
- */
-function hasAppAccess(): bool
-{
-    return !auth()->guest() || setting('app-public');
+    return auth()->user() ?: User::getGuest();
 }
 
 /**
@@ -61,7 +45,7 @@ function hasAppAccess(): bool
 function userCan(string $permission, Model $ownable = null): bool
 {
     if ($ownable === null) {
-        return user() && user()->can($permission);
+        return user()->can($permission);
     }
 
     // Check permission on ownable item