Fixed occurances of altered titles in search results

[bookstack] / app / Auth / UserRepo.php

diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index d436ab8eb0e72f2eeee6f5f04198ae6a57f2a4a0..6d48f12402060edbbe56f5660301dc1183ca5dcc 100644 (file)
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -1,68 +1,78 @@
-<?php namespace BookStack\Auth;
+<?php
+
+namespace BookStack\Auth;

 
 use Activity;
 
 use Activity;

-use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Entities\EntityProvider;
+use BookStack\Entities\Models\Book;
+use BookStack\Entities\Models\Bookshelf;
+use BookStack\Entities\Models\Chapter;
+use BookStack\Entities\Models\Page;

 use BookStack\Exceptions\NotFoundException;
 use BookStack\Exceptions\NotFoundException;

-use BookStack\Uploads\Image;
+use BookStack\Exceptions\UserUpdateException;
+use BookStack\Uploads\UserAvatars;

 use Exception;
 use Exception;

-use Images;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Pagination\LengthAwarePaginator;
+use Illuminate\Support\Facades\Log;

 
 class UserRepo
 {
 
 class UserRepo
 {

-
-    protected $user;
-    protected $role;
-    protected $entityRepo;
+    protected $userAvatar;

 
     /**
      * UserRepo constructor.
 
     /**
      * UserRepo constructor.

-     * @param User $user
-     * @param Role $role
-     * @param EntityRepo $entityRepo

      */
      */

-    public function __construct(User $user, Role $role, EntityRepo $entityRepo)
+    public function __construct(UserAvatars $userAvatar)
+    {
+        $this->userAvatar = $userAvatar;
+    }
+
+    /**
+     * Get a user by their email address.
+     */
+    public function getByEmail(string $email): ?User

     {
     {

-        $this->user = $user;
-        $this->role = $role;
-        $this->entityRepo = $entityRepo;
+        return User::query()->where('email', '=', $email)->first();

     }
 
     /**
     }
 
     /**

-     * @param string $email
-     * @return User|null
+     * Get a user by their ID.

      */
      */

-    public function getByEmail($email)
+    public function getById(int $id): User

     {
     {

-        return $this->user->where('email', '=', $email)->first();
+        return User::query()->findOrFail($id);

     }
 
     /**
     }
 
     /**

-     * @param int $id
-     * @return User
+     * Get a user by their slug.

      */
      */

-    public function getById($id)
+    public function getBySlug(string $slug): User

     {
     {

-        return $this->user->findOrFail($id);
+        return User::query()->where('slug', '=', $slug)->firstOrFail();

     }
 
     /**
      * Get all the users with their permissions.
     }
 
     /**
      * Get all the users with their permissions.

-     * @return \Illuminate\Database\Eloquent\Builder|static

      */
      */

-    public function getAllUsers()
+    public function getAllUsers(): Collection

     {
     {

-        return $this->user->with('roles', 'avatar')->orderBy('name', 'asc')->get();
+        return User::query()->with('roles', 'avatar')->orderBy('name', 'asc')->get();

     }
 
     /**
      * Get all the users with their permissions in a paginated format.
     }
 
     /**
      * Get all the users with their permissions in a paginated format.

-     * @param int $count
-     * @param $sortData
-     * @return \Illuminate\Database\Eloquent\Builder|static

      */
      */

-    public function getAllUsersPaginatedAndSorted($count, $sortData)
+    public function getAllUsersPaginatedAndSorted(int $count, array $sortData): LengthAwarePaginator

     {
     {

-        $query = $this->user->with('roles', 'avatar')->orderBy($sortData['sort'], $sortData['order']);
+        $sort = $sortData['sort'];
+
+        $query = User::query()->select(['*'])
+            ->withLastActivityAt()
+            ->with(['roles', 'avatar'])
+            ->withCount('mfaValues')
+            ->orderBy($sort, $sortData['order']);

 
         if ($sortData['search']) {
             $term = '%' . $sortData['search'] . '%';
 
         if ($sortData['search']) {
             $term = '%' . $sortData['search'] . '%';


@@ -75,43 +85,27 @@ class UserRepo
         return $query->paginate($count);
     }
 
         return $query->paginate($count);
     }
 

-     /**
+    /**

      * Creates a new user and attaches a role to them.
      * Creates a new user and attaches a role to them.

-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return \BookStack\Auth\User

      */
      */

-    public function registerNew(array $data, $verifyEmail = false)
+    public function registerNew(array $data, bool $emailConfirmed = false): User

     {
     {

-        $user = $this->create($data, $verifyEmail);
-        $this->attachDefaultRole($user);
+        $user = $this->create($data, $emailConfirmed);
+        $user->attachDefaultRole();

         $this->downloadAndAssignUserAvatar($user);
 
         return $user;
     }
 
         $this->downloadAndAssignUserAvatar($user);
 
         return $user;
     }
 

-    /**
-     * Give a user the default role. Used when creating a new user.
-     * @param User $user
-     */
-    public function attachDefaultRole(User $user)
-    {
-        $roleId = setting('registration-role');
-        if ($roleId !== false && $user->roles()->where('id', '=', $roleId)->count() === 0) {
-            $user->attachRoleId($roleId);
-        }
-    }
-

     /**
      * Assign a user to a system-level role.
     /**
      * Assign a user to a system-level role.

-     * @param User $user
-     * @param $systemRoleName
+     *

      * @throws NotFoundException
      */
      * @throws NotFoundException
      */

-    public function attachSystemRole(User $user, $systemRoleName)
+    public function attachSystemRole(User $user, string $systemRoleName)

     {
     {

-        $role = $this->role->newQuery()->where('system_name', '=', $systemRoleName)->first();
-        if ($role === null) {
+        $role = Role::getSystemRole($systemRoleName);
+        if (is_null($role)) {

             throw new NotFoundException("Role '{$systemRoleName}' not found");
         }
         $user->attachRole($role);
             throw new NotFoundException("Role '{$systemRoleName}' not found");
         }
         $user->attachRole($role);


@@ -119,142 +113,169 @@ class UserRepo
 
     /**
      * Checks if the give user is the only admin.
 
     /**
      * Checks if the give user is the only admin.

-     * @param \BookStack\Auth\User $user
-     * @return bool

      */
      */

-    public function isOnlyAdmin(User $user)
+    public function isOnlyAdmin(User $user): bool

     {
         if (!$user->hasSystemRole('admin')) {
             return false;
         }
 
     {
         if (!$user->hasSystemRole('admin')) {
             return false;
         }
 

-        $adminRole = $this->role->getSystemRole('admin');
-        if ($adminRole->users->count() > 1) {
+        $adminRole = Role::getSystemRole('admin');
+        if ($adminRole->users()->count() > 1) {

             return false;
         }
             return false;
         }

+

         return true;
     }
 
         return true;
     }
 

+    /**
+     * Set the assigned user roles via an array of role IDs.
+     *
+     * @throws UserUpdateException
+     */
+    public function setUserRoles(User $user, array $roles)
+    {
+        if ($this->demotingLastAdmin($user, $roles)) {
+            throw new UserUpdateException(trans('errors.role_cannot_remove_only_admin'), $user->getEditUrl());
+        }
+
+        $user->roles()->sync($roles);
+    }
+
+    /**
+     * Check if the given user is the last admin and their new roles no longer
+     * contains the admin role.
+     */
+    protected function demotingLastAdmin(User $user, array $newRoles): bool
+    {
+        if ($this->isOnlyAdmin($user)) {
+            $adminRole = Role::getSystemRole('admin');
+            if (!in_array(strval($adminRole->id), $newRoles)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+

     /**
      * Create a new basic instance of user.
     /**
      * Create a new basic instance of user.

-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return \BookStack\Auth\User

      */
      */

-    public function create(array $data, $verifyEmail = false)
+    public function create(array $data, bool $emailConfirmed = false): User

     {
     {

+        $details = [
+            'name'             => $data['name'],
+            'email'            => $data['email'],
+            'password'         => bcrypt($data['password']),
+            'email_confirmed'  => $emailConfirmed,
+            'external_auth_id' => $data['external_auth_id'] ?? '',
+        ];
+
+        $user = new User();
+        $user->forceFill($details);
+        $user->refreshSlug();
+        $user->save();

 
 

-        return $this->user->forceCreate([
-            'name'     => $data['name'],
-            'email'    => $data['email'],
-            'password' => bcrypt($data['password']),
-            'email_confirmed' => $verifyEmail
-        ]);
+        return $user;

     }
 
     /**
      * Remove the given user from storage, Delete all related content.
     }
 
     /**
      * Remove the given user from storage, Delete all related content.

-     * @param \BookStack\Auth\User $user
+     *

      * @throws Exception
      */
      * @throws Exception
      */

-    public function destroy(User $user)
+    public function destroy(User $user, ?int $newOwnerId = null)

     {
         $user->socialAccounts()->delete();
     {
         $user->socialAccounts()->delete();

+        $user->apiTokens()->delete();
+        $user->favourites()->delete();
+        $user->mfaValues()->delete();

         $user->delete();
         $user->delete();

-        
+

         // Delete user profile images
         // Delete user profile images

-        $profileImages = $images = Image::where('type', '=', 'user')->where('created_by', '=', $user->id)->get();
-        foreach ($profileImages as $image) {
-            Images::destroy($image);
+        $this->userAvatar->destroyAllForUser($user);
+
+        if (!empty($newOwnerId)) {
+            $newOwner = User::query()->find($newOwnerId);
+            if (!is_null($newOwner)) {
+                $this->migrateOwnership($user, $newOwner);
+            }
+        }
+    }
+
+    /**
+     * Migrate ownership of items in the system from one user to another.
+     */
+    protected function migrateOwnership(User $fromUser, User $toUser)
+    {
+        $entities = (new EntityProvider())->all();
+        foreach ($entities as $instance) {
+            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
+                ->update(['owned_by' => $toUser->id]);

         }
     }
 
     /**
      * Get the latest activity for a user.
         }
     }
 
     /**
      * Get the latest activity for a user.

-     * @param \BookStack\Auth\User $user
-     * @param int $count
-     * @param int $page
-     * @return array

      */
      */

-    public function getActivity(User $user, $count = 20, $page = 0)
+    public function getActivity(User $user, int $count = 20, int $page = 0): array

     {
         return Activity::userActivity($user, $count, $page);
     }
 
     /**
      * Get the recently created content for this given user.
     {
         return Activity::userActivity($user, $count, $page);
     }
 
     /**
      * Get the recently created content for this given user.

-     * @param \BookStack\Auth\User $user
-     * @param int $count
-     * @return mixed

      */
      */

-    public function getRecentlyCreated(User $user, $count = 20)
+    public function getRecentlyCreated(User $user, int $count = 20): array

     {
     {

+        $query = function (Builder $query) use ($user, $count) {
+            return $query->orderBy('created_at', 'desc')
+                ->where('created_by', '=', $user->id)
+                ->take($count)
+                ->get();
+        };
+

         return [
         return [

-            'pages'    => $this->entityRepo->getRecentlyCreated('page', $count, 0, function ($query) use ($user) {
-                $query->where('created_by', '=', $user->id);
-            }),
-            'chapters' => $this->entityRepo->getRecentlyCreated('chapter', $count, 0, function ($query) use ($user) {
-                $query->where('created_by', '=', $user->id);
-            }),
-            'books'    => $this->entityRepo->getRecentlyCreated('book', $count, 0, function ($query) use ($user) {
-                $query->where('created_by', '=', $user->id);
-            })
+            'pages'    => $query(Page::visible()->where('draft', '=', false)),
+            'chapters' => $query(Chapter::visible()),
+            'books'    => $query(Book::visible()),
+            'shelves'  => $query(Bookshelf::visible()),

         ];
     }
 
     /**
      * Get asset created counts for the give user.
         ];
     }
 
     /**
      * Get asset created counts for the give user.

-     * @param \BookStack\Auth\User $user
-     * @return array

      */
      */

-    public function getAssetCounts(User $user)
+    public function getAssetCounts(User $user): array

     {
     {

+        $createdBy = ['created_by' => $user->id];
+

         return [
         return [

-            'pages'    => $this->entityRepo->getUserTotalCreated('page', $user),
-            'chapters' => $this->entityRepo->getUserTotalCreated('chapter', $user),
-            'books'    => $this->entityRepo->getUserTotalCreated('book', $user),
+            'pages'       => Page::visible()->where($createdBy)->count(),
+            'chapters'    => Chapter::visible()->where($createdBy)->count(),
+            'books'       => Book::visible()->where($createdBy)->count(),
+            'shelves'     => Bookshelf::visible()->where($createdBy)->count(),

         ];
     }
 
     /**
      * 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

      */
      */

-    public function getAllRoles()
+    public function getAllRoles(): Collection

     {
     {

-        return $this->role->all();
-    }
-
-    /**
-     * Get all the roles which can be given restricted access to
-     * other entities in the system.
-     * @return mixed
-     */
-    public function getRestrictableRoles()
-    {
-        return $this->role->where('system_name', '!=', 'admin')->get();
+        return Role::query()->orderBy('display_name', 'asc')->get();

     }
 
     /**
      * Get an avatar image for a user and set it as their avatar.
      * Returns early if avatars disabled or not set in config.
     }
 
     /**
      * Get an avatar image for a user and set it as their avatar.
      * Returns early if avatars disabled or not set in config.

-     * @param User $user
-     * @return bool

      */
      */

-    public function downloadAndAssignUserAvatar(User $user)
+    public function downloadAndAssignUserAvatar(User $user): void

     {
     {

-        if (!Images::avatarFetchEnabled()) {
-            return false;
-        }
-

         try {
         try {

-            $avatar = Images::saveUserAvatar($user);
-            $user->avatar()->associate($avatar);
-            $user->save();
-            return true;
+            $this->userAvatar->fetchAndAssignToUser($user);

         } catch (Exception $e) {
         } catch (Exception $e) {

-            \Log::error('Failed to save user avatar image');
-            return false;
+            Log::error('Failed to save user avatar image');

         }
     }
 }
         }
     }
 }