added missing comma that caused the testprocess to fail.

[bookstack] / app / Auth / UserRepo.php

diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index d436ab8eb0e72f2eeee6f5f04198ae6a57f2a4a0..fdb8c0923882cabe08e03f4db68e6b89609e1468 100644 (file)
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -1,37 +1,37 @@
 <?php namespace BookStack\Auth;
 
 use Activity;
 <?php namespace BookStack\Auth;
 
 use Activity;

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

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

+use BookStack\Exceptions\UserUpdateException;

 use BookStack\Uploads\Image;
 use Exception;
 use BookStack\Uploads\Image;
 use Exception;

+use Illuminate\Database\Eloquent\Builder;

 use Images;
 use Images;

+use Log;

 
 class UserRepo
 {
 
     protected $user;
     protected $role;
 
 class UserRepo
 {
 
     protected $user;
     protected $role;

-    protected $entityRepo;

 
     /**
      * 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(User $user, Role $role)

     {
         $this->user = $user;
         $this->role = $role;
     {
         $this->user = $user;
         $this->role = $role;

-        $this->entityRepo = $entityRepo;

     }
 
     /**
     }
 
     /**

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

      */
      */

-    public function getByEmail($email)
+    public function getByEmail(string $email): ?User

     {
         return $this->user->where('email', '=', $email)->first();
     }
     {
         return $this->user->where('email', '=', $email)->first();
     }


@@ -42,12 +42,12 @@ class UserRepo
      */
     public function getById($id)
     {
      */
     public function getById($id)
     {

-        return $this->user->findOrFail($id);
+        return $this->user->newQuery()->findOrFail($id);

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

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

      */
     public function getAllUsers()
     {
      */
     public function getAllUsers()
     {


@@ -58,7 +58,7 @@ class UserRepo
      * Get all the users with their permissions in a paginated format.
      * @param int $count
      * @param $sortData
      * Get all the users with their permissions in a paginated format.
      * @param int $count
      * @param $sortData

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

      */
     public function getAllUsersPaginatedAndSorted($count, $sortData)
     {
      */
     public function getAllUsersPaginatedAndSorted($count, $sortData)
     {


@@ -77,31 +77,16 @@ class UserRepo
 
      /**
      * 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.
      * @param User $user
     /**
      * Assign a user to a system-level role.
      * @param User $user


@@ -119,7 +104,7 @@ 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
+     * @param User $user

      * @return bool
      */
     public function isOnlyAdmin(User $user)
      * @return bool
      */
     public function isOnlyAdmin(User $user)


@@ -136,34 +121,66 @@ class UserRepo
     }
 
     /**
     }
 
     /**

-     * Create a new basic instance of user.
-     * @param array $data
-     * @param boolean $verifyEmail
-     * @return \BookStack\Auth\User
+     * Set the assigned user roles via an array of role IDs.
+     * @param User $user
+     * @param array $roles
+     * @throws UserUpdateException

      */
      */

-    public function create(array $data, $verifyEmail = false)
+    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.
+     * @param User $user
+     * @param array $newRoles
+     * @return bool
+     */
+    protected function demotingLastAdmin(User $user, array $newRoles) : bool
+    {
+        if ($this->isOnlyAdmin($user)) {
+            $adminRole = $this->role->getSystemRole('admin');
+            if (!in_array(strval($adminRole->id), $newRoles)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Create a new basic instance of user.
+     */
+    public function create(array $data, bool $emailConfirmed = false): User
+    {

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

-            'email_confirmed' => $verifyEmail
+            'email_confirmed' => $emailConfirmed,
+            'external_auth_id' => $data['external_auth_id'] ?? '',

         ]);
     }
 
     /**
      * 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
+     * @param User $user

      * @throws Exception
      */
     public function destroy(User $user)
     {
         $user->socialAccounts()->delete();
      * @throws Exception
      */
     public function destroy(User $user)
     {
         $user->socialAccounts()->delete();

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

         $user->delete();
         
         // Delete user profile images
         $user->delete();
         
         // Delete user profile images

-        $profileImages = $images = Image::where('type', '=', 'user')->where('created_by', '=', $user->id)->get();
+        $profileImages = Image::where('type', '=', 'user')->where('uploaded_to', '=', $user->id)->get();

         foreach ($profileImages as $image) {
             Images::destroy($image);
         }
         foreach ($profileImages as $image) {
             Images::destroy($image);
         }


@@ -171,7 +188,7 @@ class UserRepo
 
     /**
      * Get the latest activity for a user.
 
     /**
      * Get the latest activity for a user.

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

      * @param int $count
      * @param int $page
      * @return array
      * @param int $count
      * @param int $page
      * @return array


@@ -183,36 +200,35 @@ class UserRepo
 
     /**
      * Get the recently created content for this given user.
 
     /**
      * 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(),

         ];
     }
 
         ];
     }
 


@@ -222,17 +238,7 @@ class UserRepo
      */
     public function getAllRoles()
     {
      */
     public function getAllRoles()
     {

-        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 $this->role->newQuery()->orderBy('display_name', 'asc')->get();

     }
 
     /**
     }
 
     /**


@@ -253,7 +259,7 @@ class UserRepo
             $user->save();
             return true;
         } catch (Exception $e) {
             $user->save();
             return true;
         } catch (Exception $e) {

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

             return false;
         }
     }
             return false;
         }
     }