reduced icon size

[bookstack] / app / Repos / UserRepo.php

diff --git a/app/Repos/UserRepo.php b/app/Repos/UserRepo.php
index 01cf80d29fcf0322f7847516130d2d9d87798bbe..3cfd61d279b427dd79400180659ec6504df722eb 100644 (file)
--- a/app/Repos/UserRepo.php
+++ b/app/Repos/UserRepo.php
@@ -1,8 +1,12 @@
 <?php namespace BookStack\Repos;
 
 <?php namespace BookStack\Repos;
 

+use Activity;
+use BookStack\Exceptions\NotFoundException;
+use BookStack\Image;

 use BookStack\Role;
 use BookStack\User;
 use BookStack\Role;
 use BookStack\User;

-use Setting;
+use Exception;
+use Images;

 
 class UserRepo
 {
 
 class UserRepo
 {


@@ -51,6 +55,27 @@ class UserRepo
         return $this->user->with('roles', 'avatar')->orderBy('name', 'asc')->get();
     }
 
         return $this->user->with('roles', 'avatar')->orderBy('name', 'asc')->get();
     }
 

+    /**
+     * 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)
+    {
+        $query = $this->user->with('roles', 'avatar')->orderBy($sortData['sort'], $sortData['order']);
+
+        if ($sortData['search']) {
+            $term = '%' . $sortData['search'] . '%';
+            $query->where(function ($query) use ($term) {
+                $query->where('name', 'like', $term)
+                    ->orWhere('email', 'like', $term);
+            });
+        }
+
+        return $query->paginate($count);
+    }
+

     /**
      * Creates a new user and attaches a role to them.
      * @param array $data
     /**
      * Creates a new user and attaches a role to them.
      * @param array $data


@@ -62,11 +87,7 @@ class UserRepo
         $this->attachDefaultRole($user);
 
         // Get avatar from gravatar and save
         $this->attachDefaultRole($user);
 
         // Get avatar from gravatar and save

-        if (!config('services.disable_services')) {
-            $avatar = \Images::saveUserGravatar($user);
-            $user->avatar()->associate($avatar);
-            $user->save();
-        }
+        $this->downloadGravatarToUserAvatar($user);

 
         return $user;
     }
 
         return $user;
     }


@@ -77,11 +98,28 @@ class UserRepo
      */
     public function attachDefaultRole($user)
     {
      */
     public function attachDefaultRole($user)
     {

-        $roleId = Setting::get('registration-role');
-        if ($roleId === false) $roleId = $this->role->first()->id;
+        $roleId = setting('registration-role');
+        if ($roleId === false) {
+            $roleId = $this->role->first()->id;
+        }

         $user->attachRoleId($roleId);
     }
 
         $user->attachRoleId($roleId);
     }
 

+    /**
+     * Assign a user to a system-level role.
+     * @param User $user
+     * @param $systemRoleName
+     * @throws NotFoundException
+     */
+    public function attachSystemRole(User $user, $systemRoleName)
+    {
+        $role = $this->role->newQuery()->where('system_name', '=', $systemRoleName)->first();
+        if ($role === null) {
+            throw new NotFoundException("Role '{$systemRoleName}' not found");
+        }
+        $user->attachRole($role);
+    }
+

     /**
      * Checks if the give user is the only admin.
      * @param User $user
     /**
      * Checks if the give user is the only admin.
      * @param User $user


@@ -89,10 +127,14 @@ class UserRepo
      */
     public function isOnlyAdmin(User $user)
     {
      */
     public function isOnlyAdmin(User $user)
     {

-        if (!$user->roles->pluck('name')->contains('admin')) return false;
+        if (!$user->hasSystemRole('admin')) {
+            return false;
+        }

 
 

-        $adminRole = $this->role->getRole('admin');
-        if ($adminRole->users->count() > 1) return false;
+        $adminRole = $this->role->getSystemRole('admin');
+        if ($adminRole->users->count() > 1) {
+            return false;
+        }

         return true;
     }
 
         return true;
     }
 


@@ -106,18 +148,26 @@ class UserRepo
         return $this->user->forceCreate([
             'name'     => $data['name'],
             'email'    => $data['email'],
         return $this->user->forceCreate([
             'name'     => $data['name'],
             'email'    => $data['email'],

-            'password' => bcrypt($data['password'])
+            'password' => bcrypt($data['password']),
+            'email_confirmed' => false

         ]);
     }
 
     /**
      * Remove the given user from storage, Delete all related content.
      * @param User $user
         ]);
     }
 
     /**
      * Remove the given user from storage, Delete all related content.
      * @param User $user

+     * @throws Exception

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

+        
+        // Delete user profile images
+        $profileImages = $images = Image::where('type', '=', 'user')->where('created_by', '=', $user->id)->get();
+        foreach ($profileImages as $image) {
+            Images::destroyImage($image);
+        }

     }
 
     /**
     }
 
     /**


@@ -129,7 +179,7 @@ class UserRepo
      */
     public function getActivity(User $user, $count = 20, $page = 0)
     {
      */
     public function getActivity(User $user, $count = 20, $page = 0)
     {

-        return \Activity::userActivity($user, $count, $page);
+        return Activity::userActivity($user, $count, $page);

     }
 
     /**
     }
 
     /**


@@ -141,12 +191,15 @@ class UserRepo
     public function getRecentlyCreated(User $user, $count = 20)
     {
         return [
     public function getRecentlyCreated(User $user, $count = 20)
     {
         return [

-            'pages' => $this->entityRepo->page->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
-                ->take($count)->get(),
-            'chapters' => $this->entityRepo->chapter->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
-                ->take($count)->get(),
-            'books' => $this->entityRepo->book->where('created_by', '=', $user->id)->orderBy('created_at', 'desc')
-                ->take($count)->get()
+            '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);
+            })

         ];
     }
 
         ];
     }
 


@@ -158,12 +211,21 @@ class UserRepo
     public function getAssetCounts(User $user)
     {
         return [
     public function getAssetCounts(User $user)
     {
         return [

-            'pages' => $this->entityRepo->page->where('created_by', '=', $user->id)->count(),
+            'pages'    => $this->entityRepo->page->where('created_by', '=', $user->id)->count(),

             'chapters' => $this->entityRepo->chapter->where('created_by', '=', $user->id)->count(),
             'chapters' => $this->entityRepo->chapter->where('created_by', '=', $user->id)->count(),

-            'books' => $this->entityRepo->book->where('created_by', '=', $user->id)->count(),
+            'books'    => $this->entityRepo->book->where('created_by', '=', $user->id)->count(),

         ];
     }
 
         ];
     }
 

+    /**
+     * Get the roles in the system that are assignable to a user.
+     * @return mixed
+     */
+    public function getAllRoles()
+    {
+        return $this->role->all();
+    }
+

     /**
      * Get all the roles which can be given restricted access to
      * other entities in the system.
     /**
      * Get all the roles which can be given restricted access to
      * other entities in the system.


@@ -171,7 +233,30 @@ class UserRepo
      */
     public function getRestrictableRoles()
     {
      */
     public function getRestrictableRoles()
     {

-        return $this->role->where('name', '!=', 'admin')->get();
+        return $this->role->where('system_name', '!=', 'admin')->get();

     }
 
     }
 

-}
\ No newline at end of file
+    /**
+     * Get a gravatar image for a user and set it as their avatar.
+     * Does not run if gravatar disabled in config.
+     * @param User $user
+     * @return bool
+     */
+    public function downloadGravatarToUserAvatar(User $user)
+    {
+        // Get avatar from gravatar and save
+        if (!config('services.gravatar')) {
+            return false;
+        }
+
+        try {
+            $avatar = Images::saveUserGravatar($user);
+            $user->avatar()->associate($avatar);
+            $user->save();
+            return true;
+        } catch (Exception $e) {
+            \Log::error('Failed to save user gravatar image');
+            return false;
+        }
+    }
+}