Make building of search results work for multi-byte encoded characters

[bookstack] / app / Auth / UserRepo.php

diff --git a/app/Auth/UserRepo.php b/app/Auth/UserRepo.php
index 61ca12dcc8f7d00e410170e0567e3b107ca0dc86..84002b7f7a5b720fc8be550bbce2cfb72b88022f 100644 (file)
--- a/app/Auth/UserRepo.php
+++ b/app/Auth/UserRepo.php
@@ -15,7 +15,7 @@ use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;

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

 
 class UserRepo
 {
 
 class UserRepo
 {


@@ -63,14 +63,18 @@ class UserRepo
 
     /**
      * 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'];
 
         $query = User::query()->select(['*'])
      */
     public function getAllUsersPaginatedAndSorted(int $count, array $sortData): LengthAwarePaginator
     {
         $sort = $sortData['sort'];
 
         $query = User::query()->select(['*'])

-            ->withLastActivityAt()
+            ->scopes(['withLastActivityAt'])

             ->with(['roles', 'avatar'])
             ->with(['roles', 'avatar'])

+            ->withCount('mfaValues')

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


@@ -188,6 +192,7 @@ class UserRepo
         $user->socialAccounts()->delete();
         $user->apiTokens()->delete();
         $user->favourites()->delete();
         $user->socialAccounts()->delete();
         $user->apiTokens()->delete();
         $user->favourites()->delete();

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

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