Modernize third party services' logos

[bookstack] / app / Auth / UserRepo.php

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

 
 use Activity;
 
 use Activity;

+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 Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;
 use BookStack\Uploads\UserAvatars;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Pagination\LengthAwarePaginator;

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

 
 class UserRepo
 {
 
 class UserRepo
 {


@@ -44,6 +45,14 @@ class UserRepo
         return User::query()->findOrFail($id);
     }
 
         return User::query()->findOrFail($id);
     }
 

+    /**
+     * Get a user by their slug.
+     */
+    public function getBySlug(string $slug): User
+    {
+        return User::query()->where('slug', '=', $slug)->firstOrFail();
+    }
+

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


@@ -58,14 +67,11 @@ class UserRepo
     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 = User::query()->with(['roles', 'avatar', 'latestActivity'])
+        $query = User::query()->select(['*'])
+            ->withLastActivityAt()
+            ->with(['roles', 'avatar'])
+            ->withCount('mfaValues')

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


@@ -79,7 +85,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


@@ -93,6 +99,7 @@ class UserRepo
 
     /**
      * Assign a user to a system-level role.
 
     /**
      * Assign a user to a system-level role.

+     *

      * @throws NotFoundException
      */
     public function attachSystemRole(User $user, string $systemRoleName)
      * @throws NotFoundException
      */
     public function attachSystemRole(User $user, string $systemRoleName)


@@ -123,6 +130,7 @@ class UserRepo
 
     /**
      * Set the assigned user roles via an array of role IDs.
 
     /**
      * Set the assigned user roles via an array of role IDs.

+     *

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


@@ -138,7 +146,7 @@ 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.
      */

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

     {
         if ($this->isOnlyAdmin($user)) {
             $adminRole = Role::getSystemRole('admin');
     {
         if ($this->isOnlyAdmin($user)) {
             $adminRole = Role::getSystemRole('admin');


@@ -156,32 +164,54 @@ class UserRepo
     public function create(array $data, bool $emailConfirmed = false): User
     {
         $details = [
     public function create(array $data, bool $emailConfirmed = false): User
     {
         $details = [

-            'name'     => $data['name'],
-            'email'    => $data['email'],
-            'password' => bcrypt($data['password']),
-            'email_confirmed' => $emailConfirmed,
+            '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'] ?? '',
         ];

-        return User::query()->forceCreate($details);
+
+        $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.

+     *

      * @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::query()->where('type', '=', 'user')
-            ->where('uploaded_to', '=', $user->id)
-            ->get();
+        $this->userAvatar->destroyAllForUser($user);
+
+        if (!empty($newOwnerId)) {
+            $newOwner = User::query()->find($newOwnerId);
+            if (!is_null($newOwner)) {
+                $this->migrateOwnership($user, $newOwner);
+            }
+        }
+    }

 
 

-        foreach ($profileImages as $image) {
-            Images::destroy($image);
+    /**
+     * 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]);

         }
     }
 
         }
     }
 


@@ -219,11 +249,12 @@ 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(),

         ];
     }
 
         ];
     }