fix(503): massively simplify the 503 error view

[bookstack] / app / Auth / UserRepo.php

diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index 884f534631823826f00888e34df614e693f7e388..ff2e91ee23a8ad8c7b3dfdee003ff741a04db1a4 100644 (file)
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -1,32 +1,31 @@
-<?php namespace BookStack\Auth;
+<?php

 
 

-use Activity;
+namespace BookStack\Auth;
+
+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\UserUpdateException;
 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\UserUpdateException;

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

 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;

+use Illuminate\Database\Eloquent\Collection;

 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Pagination\LengthAwarePaginator;

-use Images;
-use Log;
+use Illuminate\Support\Facades\Log;

 
 class UserRepo
 {
 
 class UserRepo
 {

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

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

-    public function __construct(User $user, Role $role)
+    public function __construct(UserAvatars $userAvatar)

     {
     {

-        $this->user = $user;
-        $this->role = $role;
+        $this->userAvatar = $userAvatar;

     }
 
     /**
     }
 
     /**


@@ -34,41 +33,47 @@ class UserRepo
      */
     public function getByEmail(string $email): ?User
     {
      */
     public function getByEmail(string $email): ?User
     {

-        return $this->user->where('email', '=', $email)->first();
+        return User::query()->where('email', '=', $email)->first();
+    }
+
+    /**
+     * Get a user by their ID.
+     */
+    public function getById(int $id): User
+    {
+        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->newQuery()->findOrFail($id);
+        return User::query()->where('slug', '=', $slug)->firstOrFail();

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

-     * @return 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.

+     * Note: Due to the use of email search this should only be used when
+     * user is assumed to be trusted. (Admin users).
+     * Email search can be abused to extract email addresses.

      */
     public function getAllUsersPaginatedAndSorted(int $count, array $sortData): LengthAwarePaginator
     {
         $sort = $sortData['sort'];
      */
     public function getAllUsersPaginatedAndSorted(int $count, array $sortData): LengthAwarePaginator
     {
         $sort = $sortData['sort'];

-        if ($sort === 'latest_activity') {
-            $sort = \BookStack\Actions\Activity::query()->select('created_at')
-                ->whereColumn('activities.user_id', 'users.id')
-                ->latest()
-                ->take(1);
-        }

 
 

-        $query = $this->user->with(['roles', 'avatar', 'latestActivity'])
+        $query = User::query()->select(['*'])
+            ->scopes(['withLastActivityAt'])
+            ->with(['roles', 'avatar'])
+            ->withCount('mfaValues')

             ->orderBy($sort, $sortData['order']);
 
         if ($sortData['search']) {
             ->orderBy($sort, $sortData['order']);
 
         if ($sortData['search']) {


@@ -82,7 +87,7 @@ class UserRepo
         return $query->paginate($count);
     }
 
         return $query->paginate($count);
     }
 

-     /**
+    /**

      * Creates a new user and attaches a role to them.
      */
     public function registerNew(array $data, bool $emailConfirmed = false): User
      * Creates a new user and attaches a role to them.
      */
     public function registerNew(array $data, bool $emailConfirmed = false): User


@@ -96,14 +101,13 @@ class UserRepo
 
     /**
      * 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);


@@ -111,26 +115,24 @@ class UserRepo
 
     /**
      * Checks if the give user is the only admin.
 
     /**
      * Checks if the give user is the only admin.

-     * @param 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;
     }
 
     /**
      * Set the assigned user roles via an array of role IDs.
         return true;
     }
 
     /**
      * Set the assigned user roles via an array of role IDs.

-     * @param User $user
-     * @param array $roles
+     *

      * @throws UserUpdateException
      */
     public function setUserRoles(User $user, array $roles)
      * @throws UserUpdateException
      */
     public function setUserRoles(User $user, array $roles)


@@ -145,14 +147,11 @@ class UserRepo
     /**
      * Check if the given user is the last admin and their new roles no longer
      * contains the admin role.
     /**
      * Check if the given user is the last admin and their new roles no longer
      * contains the admin role.

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

      */
      */

-    protected function demotingLastAdmin(User $user, array $newRoles) : bool
+    protected function demotingLastAdmin(User $user, array $newRoles): bool

     {
         if ($this->isOnlyAdmin($user)) {
     {
         if ($this->isOnlyAdmin($user)) {

-            $adminRole = $this->role->getSystemRole('admin');
+            $adminRole = Role::getSystemRole('admin');

             if (!in_array(strval($adminRole->id), $newRoles)) {
                 return true;
             }
             if (!in_array(strval($adminRole->id), $newRoles)) {
                 return true;
             }


@@ -166,43 +165,56 @@ class UserRepo
      */
     public function create(array $data, bool $emailConfirmed = false): User
     {
      */
     public function create(array $data, bool $emailConfirmed = false): User
     {

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

             'external_auth_id' => $data['external_auth_id'] ?? '',
             'external_auth_id' => $data['external_auth_id'] ?? '',

-        ]);
+        ];
+
+        $user = new User();
+        $user->forceFill($details);
+        $user->refreshSlug();
+        $user->save();
+
+        return $user;

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

-     * @param User $user
+     *

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

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

     {
         $user->socialAccounts()->delete();
         $user->apiTokens()->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 = Image::where('type', '=', 'user')->where('uploaded_to', '=', $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);
+            }

         }
     }
 
     /**
         }
     }
 
     /**

-     * Get the latest activity for a user.
-     * @param User $user
-     * @param int $count
-     * @param int $page
-     * @return array
+     * Migrate ownership of items in the system from one user to another.

      */
      */

-    public function getActivity(User $user, $count = 20, $page = 0)
+    protected function migrateOwnership(User $fromUser, User $toUser)

     {
     {

-        return Activity::userActivity($user, $count, $page);
+        $entities = (new EntityProvider())->all();
+        foreach ($entities as $instance) {
+            $instance->newQuery()->where('owned_by', '=', $fromUser->id)
+                ->update(['owned_by' => $toUser->id]);
+        }

     }
 
     /**
     }
 
     /**


@@ -231,43 +243,33 @@ class UserRepo
     public function getAssetCounts(User $user): array
     {
         $createdBy = ['created_by' => $user->id];
     public function getAssetCounts(User $user): array
     {
         $createdBy = ['created_by' => $user->id];

+

         return [
         return [

-            'pages'    =>  Page::visible()->where($createdBy)->count(),
-            'chapters'    =>  Chapter::visible()->where($createdBy)->count(),
-            'books'    =>  Book::visible()->where($createdBy)->count(),
-            'shelves'    =>  Bookshelf::visible()->where($createdBy)->count(),
+            '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->newQuery()->orderBy('display_name', 'asc')->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) {
             Log::error('Failed to save user avatar image');
         } catch (Exception $e) {
             Log::error('Failed to save user avatar image');

-            return false;

         }
     }
 }
         }
     }
 }