Started work on making the public role/user configurable

Create a new 'public' guest user and made the public
role visible on role setting screens.

@@ -117,7 +117,7 @@ class ChapterController extends Controller
         $this->checkOwnablePermission('chapter-update', $chapter);
         $this->checkOwnablePermission('chapter-update', $chapter);
         $chapter->fill($request->all());
         $chapter->fill($request->all());
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);
         $chapter->slug = $this->chapterRepo->findSuitableSlug($chapter->name, $book->id, $chapter->id);
-        $chapter->updated_by = auth()->user()->id;
+        $chapter->updated_by = user()->id;
         $chapter->save();
         $chapter->save();
         Activity::add($chapter, 'chapter_update', $book->id);
         Activity::add($chapter, 'chapter_update', $book->id);
         return redirect($chapter->getUrl());
         return redirect($chapter->getUrl());

@@ -33,17 +33,16 @@ abstract class Controller extends BaseController
         $this->middleware(function ($request, $next) {
         $this->middleware(function ($request, $next) {
 
 
             // Get a user instance for the current user
             // Get a user instance for the current user
-            $user = auth()->user();
-            if (!$user) $user = User::getDefault();
-
-            // Share variables with views
-            view()->share('signedIn', auth()->check());
-            view()->share('currentUser', $user);
+            $user = user();
 
 
             // Share variables with controllers
             // Share variables with controllers
             $this->currentUser = $user;
             $this->currentUser = $user;
             $this->signedIn = auth()->check();
             $this->signedIn = auth()->check();
 
 
+            // Share variables with views
+            view()->share('signedIn', $this->signedIn);
+            view()->share('currentUser', $user);
+
             return $next($request);
             return $next($request);
         });
         });
     }
     }

@@ -57,7 +57,7 @@ class UserController extends Controller
     {
     {
         $this->checkPermission('users-manage');
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');
         $authMethod = config('auth.method');
-        $roles = $this->userRepo->getAssignableRoles();
+        $roles = $this->userRepo->getAllRoles();
         return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
         return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
     }
     }
 
 
@@ -126,12 +126,13 @@ class UserController extends Controller
             return $this->currentUser->id == $id;
             return $this->currentUser->id == $id;
         });
         });
 
 
-        $authMethod = config('auth.method');
-
         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);
+
+        $authMethod = ($user->system_name) ? 'system' : config('auth.method');
+
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle('User Profile');
         $this->setPageTitle('User Profile');
-        $roles = $this->userRepo->getAssignableRoles();
+        $roles = $this->userRepo->getAllRoles();
         return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
         return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
     }
     }
 
 

@@ -132,8 +132,8 @@ class BookRepo extends EntityRepo
     {
     {
         $book = $this->book->newInstance($input);
         $book = $this->book->newInstance($input);
         $book->slug = $this->findSuitableSlug($book->name);
         $book->slug = $this->findSuitableSlug($book->name);
-        $book->created_by = auth()->user()->id;
-        $book->updated_by = auth()->user()->id;
+        $book->created_by = user()->id;
+        $book->updated_by = user()->id;
         $book->save();
         $book->save();
         $this->permissionService->buildJointPermissionsForEntity($book);
         $this->permissionService->buildJointPermissionsForEntity($book);
         return $book;
         return $book;
@@ -149,7 +149,7 @@ class BookRepo extends EntityRepo
     {
     {
         $book->fill($input);
         $book->fill($input);
         $book->slug = $this->findSuitableSlug($book->name, $book->id);
         $book->slug = $this->findSuitableSlug($book->name, $book->id);
-        $book->updated_by = auth()->user()->id;
+        $book->updated_by = user()->id;
         $book->save();
         $book->save();
         $this->permissionService->buildJointPermissionsForEntity($book);
         $this->permissionService->buildJointPermissionsForEntity($book);
         return $book;
         return $book;

@@ -98,8 +98,8 @@ class ChapterRepo extends EntityRepo
     {
     {
         $chapter = $this->chapter->newInstance($input);
         $chapter = $this->chapter->newInstance($input);
         $chapter->slug = $this->findSuitableSlug($chapter->name, $book->id);
         $chapter->slug = $this->findSuitableSlug($chapter->name, $book->id);
-        $chapter->created_by = auth()->user()->id;
-        $chapter->updated_by = auth()->user()->id;
+        $chapter->created_by = user()->id;
+        $chapter->updated_by = user()->id;
         $chapter = $book->chapters()->save($chapter);
         $chapter = $book->chapters()->save($chapter);
         $this->permissionService->buildJointPermissionsForEntity($chapter);
         $this->permissionService->buildJointPermissionsForEntity($chapter);
         return $chapter;
         return $chapter;

@@ -132,9 +132,8 @@ class EntityRepo
      */
      */
     public function getUserDraftPages($count = 20, $page = 0)
     public function getUserDraftPages($count = 20, $page = 0)
     {
     {
-        $user = auth()->user();
         return $this->page->where('draft', '=', true)
         return $this->page->where('draft', '=', true)
-            ->where('created_by', '=', $user->id)
+            ->where('created_by', '=', user()->id)
             ->orderBy('updated_at', 'desc')
             ->orderBy('updated_at', 'desc')
             ->skip($count * $page)->take($count)->get();
             ->skip($count * $page)->take($count)->get();
     }
     }

@@ -148,8 +148,8 @@ class PageRepo extends EntityRepo
     {
     {
         $page = $this->page->newInstance();
         $page = $this->page->newInstance();
         $page->name = 'New Page';
         $page->name = 'New Page';
-        $page->created_by = auth()->user()->id;
-        $page->updated_by = auth()->user()->id;
+        $page->created_by = user()->id;
+        $page->updated_by = user()->id;
         $page->draft = true;
         $page->draft = true;
 
 
         if ($chapter) $page->chapter_id = $chapter->id;
         if ($chapter) $page->chapter_id = $chapter->id;
@@ -330,7 +330,7 @@ class PageRepo extends EntityRepo
         }
         }
 
 
         // Update with new details
         // Update with new details
-        $userId = auth()->user()->id;
+        $userId = user()->id;
         $page->fill($input);
         $page->fill($input);
         $page->html = $this->formatHtml($input['html']);
         $page->html = $this->formatHtml($input['html']);
         $page->text = strip_tags($page->html);
         $page->text = strip_tags($page->html);
@@ -363,7 +363,7 @@ class PageRepo extends EntityRepo
         $page->fill($revision->toArray());
         $page->fill($revision->toArray());
         $page->slug = $this->findSuitableSlug($page->name, $book->id, $page->id);
         $page->slug = $this->findSuitableSlug($page->name, $book->id, $page->id);
         $page->text = strip_tags($page->html);
         $page->text = strip_tags($page->html);
-        $page->updated_by = auth()->user()->id;
+        $page->updated_by = user()->id;
         $page->save();
         $page->save();
         return $page;
         return $page;
     }
     }
@@ -381,7 +381,7 @@ class PageRepo extends EntityRepo
         $revision->page_id = $page->id;
         $revision->page_id = $page->id;
         $revision->slug = $page->slug;
         $revision->slug = $page->slug;
         $revision->book_slug = $page->book->slug;
         $revision->book_slug = $page->book->slug;
-        $revision->created_by = auth()->user()->id;
+        $revision->created_by = user()->id;
         $revision->created_at = $page->updated_at;
         $revision->created_at = $page->updated_at;
         $revision->type = 'version';
         $revision->type = 'version';
         $revision->summary = $summary;
         $revision->summary = $summary;
@@ -404,7 +404,7 @@ class PageRepo extends EntityRepo
      */
      */
     public function saveUpdateDraft(Page $page, $data = [])
     public function saveUpdateDraft(Page $page, $data = [])
     {
     {
-        $userId = auth()->user()->id;
+        $userId = user()->id;
         $drafts = $this->userUpdateDraftsQuery($page, $userId)->get();
         $drafts = $this->userUpdateDraftsQuery($page, $userId)->get();
 
 
         if ($drafts->count() > 0) {
         if ($drafts->count() > 0) {
@@ -535,7 +535,7 @@ class PageRepo extends EntityRepo
         $query = $this->pageRevision->where('type', '=', 'update_draft')
         $query = $this->pageRevision->where('type', '=', 'update_draft')
             ->where('page_id', '=', $page->id)
             ->where('page_id', '=', $page->id)
             ->where('updated_at', '>', $page->updated_at)
             ->where('updated_at', '>', $page->updated_at)
-            ->where('created_by', '!=', auth()->user()->id)
+            ->where('created_by', '!=', user()->id)
             ->with('createdBy');
             ->with('createdBy');
 
 
         if ($minRange !== null) {
         if ($minRange !== null) {

@@ -35,7 +35,7 @@ class PermissionsRepo
      */
      */
     public function getAllRoles()
     public function getAllRoles()
     {
     {
-        return $this->role->where('hidden', '=', false)->get();
+        return $this->role->all();
     }
     }
 
 
     /**
     /**
@@ -45,7 +45,7 @@ class PermissionsRepo
      */
      */
     public function getAllRolesExcept(Role $role)
     public function getAllRolesExcept(Role $role)
     {
     {
-        return $this->role->where('id', '!=', $role->id)->where('hidden', '=', false)->get();
+        return $this->role->where('id', '!=', $role->id)->get();
     }
     }
 
 
     /**
     /**
@@ -90,8 +90,6 @@ class PermissionsRepo
     {
     {
         $role = $this->role->findOrFail($roleId);
         $role = $this->role->findOrFail($roleId);
 
 
-        if ($role->hidden) throw new PermissionsException("Cannot update a hidden role");
-
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $permissions = isset($roleData['permissions']) ? array_keys($roleData['permissions']) : [];
         $this->assignRolePermissions($role, $permissions);
         $this->assignRolePermissions($role, $permissions);
 
 

@@ -199,9 +199,9 @@ class UserRepo
      * Get the roles in the system that are assignable to a user.
      * Get the roles in the system that are assignable to a user.
      * @return mixed
      * @return mixed
      */
      */
-    public function getAssignableRoles()
+    public function getAllRoles()
     {
     {
-        return $this->role->visible();
+        return $this->role->all();
     }
     }
 
 
     /**
     /**
@@ -211,7 +211,7 @@ class UserRepo
      */
      */
     public function getRestrictableRoles()
     public function getRestrictableRoles()
     {
     {
-        return $this->role->where('hidden', '=', false)->where('system_name', '=', '')->get();
+        return $this->role->where('system_name', '!=', 'admin')->get();
     }
     }
 
 
 }
 }
\ No newline at end of file

@@ -19,7 +19,7 @@ class ActivityService
     {
     {
         $this->activity = $activity;
         $this->activity = $activity;
         $this->permissionService = $permissionService;
         $this->permissionService = $permissionService;
-        $this->user = auth()->user();
+        $this->user = user();
     }
     }
 
 
     /**
     /**

@@ -108,8 +108,8 @@ class ImageService
             'uploaded_to' => $uploadedTo
             'uploaded_to' => $uploadedTo
         ];
         ];
 
 
-        if (auth()->user() && auth()->user()->id !== 0) {
-            $userId = auth()->user()->id;
+        if (user()->id !== 0) {
+            $userId = user()->id;
             $imageDetails['created_by'] = $userId;
             $imageDetails['created_by'] = $userId;
             $imageDetails['updated_by'] = $userId;
             $imageDetails['updated_by'] = $userId;
         }
         }

@@ -614,7 +614,7 @@ class PermissionService
     private function currentUser()
     private function currentUser()
     {
     {
         if ($this->currentUserModel === false) {
         if ($this->currentUserModel === false) {
-            $this->currentUserModel = auth()->user() ? auth()->user() : new User();
+            $this->currentUserModel = user();
         }
         }
 
 
         return $this->currentUserModel;
         return $this->currentUserModel;

@@ -100,7 +100,7 @@ class SocialAuthService
         $socialAccount = $this->socialAccount->where('driver_id', '=', $socialId)->first();
         $socialAccount = $this->socialAccount->where('driver_id', '=', $socialId)->first();
         $user = $this->userRepo->getByEmail($socialUser->getEmail());
         $user = $this->userRepo->getByEmail($socialUser->getEmail());
         $isLoggedIn = auth()->check();
         $isLoggedIn = auth()->check();
-        $currentUser = auth()->user();
+        $currentUser = user();
 
 
         // When a user is not logged in and a matching SocialAccount exists,
         // When a user is not logged in and a matching SocialAccount exists,
         // Simply log the user into the application.
         // Simply log the user into the application.
@@ -214,9 +214,9 @@ class SocialAuthService
     public function detachSocialAccount($socialDriver)
     public function detachSocialAccount($socialDriver)
     {
     {
         session();
         session();
-        auth()->user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
+        user()->socialAccounts()->where('driver', '=', $socialDriver)->delete();
         session()->flash('success', title_case($socialDriver) . ' account successfully detached');
         session()->flash('success', title_case($socialDriver) . ' account successfully detached');
-        return redirect(auth()->user()->getEditUrl());
+        return redirect(user()->getEditUrl());
     }
     }
 
 
 }
 }
\ No newline at end of file

@@ -18,7 +18,7 @@ class ViewService
     public function __construct(View $view, PermissionService $permissionService)
     public function __construct(View $view, PermissionService $permissionService)
     {
     {
         $this->view = $view;
         $this->view = $view;
-        $this->user = auth()->user();
+        $this->user = user();
         $this->permissionService = $permissionService;
         $this->permissionService = $permissionService;
     }
     }
 
 
@@ -84,7 +84,7 @@ class ViewService
             ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
             ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
 
 
         if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));
         if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));
-        $query = $query->where('user_id', '=', auth()->user()->id);
+        $query = $query->where('user_id', '=', user()->id);
 
 
         $viewables = $query->with('viewable')->orderBy('updated_at', 'desc')
         $viewables = $query->with('viewable')->orderBy('updated_at', 'desc')
             ->skip($count * $page)->take($count)->get()->pluck('viewable');
             ->skip($count * $page)->take($count)->get()->pluck('viewable');

@@ -5,6 +5,7 @@ use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Notifications\Notifiable;
 
 
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
@@ -36,21 +37,30 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     protected $permissions;
     protected $permissions;
 
 
     /**
     /**
-     * Returns a default guest user.
+     * Returns the default public user.
+     * @return User
      */
      */
     public static function getDefault()
     public static function getDefault()
     {
     {
-        return new static([
-            'email' => 'guest',
-            'name' => 'Guest'
-        ]);
+        return static::where('system_name', '=', 'public')->first();
+    }
+
+    /**
+     * Check if the user is the default public user.
+     * @return bool
+     */
+    public function isDefault()
+    {
+        return $this->system_name === 'public';
     }
     }
 
 
     /**
     /**
      * The roles that belong to the user.
      * The roles that belong to the user.
+     * @return BelongsToMany
      */
      */
     public function roles()
     public function roles()
     {
     {
+        if ($this->id === 0) return ;
         return $this->belongsToMany(Role::class);
         return $this->belongsToMany(Role::class);
     }
     }
 
 

@@ -37,6 +37,16 @@ function versioned_asset($file = '')
 }
 }
 
 
 /**
 /**
+ * Helper method to get the current User.
+ * Defaults to public 'Guest' user if not logged in.
+ * @return \BookStack\User
+ */
+function user()
+{
+    return auth()->user() ?: \BookStack\User::getDefault();
+}
+
+/**
  * Check if the current user has a permission.
  * Check if the current user has a permission.
  * If an ownable element is passed in the jointPermissions are checked against
  * If an ownable element is passed in the jointPermissions are checked against
  * that particular item.
  * that particular item.
@@ -47,7 +57,7 @@ function versioned_asset($file = '')
 function userCan($permission, Ownable $ownable = null)
 function userCan($permission, Ownable $ownable = null)
 {
 {
     if ($ownable === null) {
     if ($ownable === null) {
-        return auth()->user() && auth()->user()->can($permission);
+        return user() && user()->can($permission);
     }
     }
 
 
     // Check permission on ownable item
     // Check permission on ownable item

+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class RemoveHiddenRoles extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // Remove the hidden property from roles
+        Schema::table('roles', function(Blueprint $table) {
+            $table->dropColumn('hidden');
+        });
+
+        // Add column to mark system users
+        Schema::table('users', function(Blueprint $table) {
+            $table->string('system_name')->nullable()->index();
+        });
+
+        // Insert our new public system user.
+        $publicUserId = DB::table('users')->insertGetId([
+            'email' => 'guest@example.com',
+            'name' => 'Guest',
+            'system_name' => 'public',
+            'email_confirmed' => true,
+            'created_at' => \Carbon\Carbon::now(),
+            'updated_at' => \Carbon\Carbon::now(),
+        ]);
+        
+        // Get the public role
+        $publicRole = DB::table('roles')->where('system_name', '=', 'public')->first();
+
+        // Connect the new public user to the public role
+        DB::table('role_user')->insert([
+            'user_id' => $publicUserId,
+            'role_id' => $publicRole->id
+        ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('roles', function(Blueprint $table) {
+            $table->boolean('hidden')->default(false);
+            $table->index('hidden');
+        });
+
+        DB::table('users')->where('system_name', '=', 'public')->delete();
+
+        Schema::table('users', function(Blueprint $table) {
+            $table->dropColumn('system_name');
+        });
+
+        DB::table('roles')->where('system_name', '=', 'public')->update(['hidden' => true]);
+    }
+}

@@ -79,7 +79,7 @@
                 <div class="form-group">
                 <div class="form-group">
                     <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
                     <label for="setting-registration-role">{{ trans('settings.reg_default_role') }}</label>
                     <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
                     <select id="setting-registration-role" name="setting-registration-role" @if($errors->has('setting-registration-role')) class="neg" @endif>
-                        @foreach(\BookStack\Role::visible() as $role)
+                        @foreach(\BookStack\Role::all() as $role)
                             <option value="{{$role->id}}" data-role-name="{{ $role->name }}"
                             <option value="{{$role->id}}" data-role-name="{{ $role->name }}"
                                     @if(setting('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
                                     @if(setting('registration-role', \BookStack\Role::first()->id) == $role->id) selected @endif
                                     >
                                     >

+@if($user->system_name == 'public')
+    <p>This user represents any guest users that visit your instance. It cannot be used for logins but is assigned&nbsp;automatically.</p>
+@endif
+
+<div class="form-group">
+    <label for="name">Name</label>
+    @include('form.text', ['name' => 'name'])
+</div>
+
+<div class="form-group">
+    <label for="email">Email</label>
+    @include('form.text', ['name' => 'email'])
+</div>
+
+@if(userCan('users-manage'))
+    <div class="form-group">
+        <label for="role">User Role</label>
+        @include('form/role-checkboxes', ['name' => 'roles', 'roles' => $roles])
+    </div>
+@endif
+
+<div class="form-group">
+    <a href="{{ baseUrl("/settings/users") }}" class="button muted">Cancel</a>
+    <button class="button pos" type="submit">Save</button>
+</div>