Move logFailedAccess into Activity

[bookstack] / app / Http / Controllers / UserController.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c787e78adaedf2de5f14edd460761b7a606ed4ef..207466f388fa5e8faaecdca2838f7186d7ca7cf4 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -116,22 +116,24 @@ class UserController extends Controller
 
     /**
      * Show the form for editing the specified user.
 
     /**
      * Show the form for editing the specified user.

-     * @param  int              $id
-     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
-     * @return Response

      */
      */

-    public function edit($id, SocialAuthService $socialAuthService)
+    public function edit(int $id, SocialAuthService $socialAuthService)

     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 

-        $user = $this->user->findOrFail($id);
+        $user = $this->user->newQuery()->with(['apiTokens'])->findOrFail($id);

 
         $authMethod = ($user->system_name) ? 'system' : config('auth.method');
 
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle(trans('settings.user_profile'));
         $roles = $this->userRepo->getAllRoles();
 
         $authMethod = ($user->system_name) ? 'system' : config('auth.method');
 
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle(trans('settings.user_profile'));
         $roles = $this->userRepo->getAllRoles();

-        return view('users.edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
+        return view('users.edit', [
+            'user' => $user,
+            'activeSocialDrivers' => $activeSocialDrivers,
+            'authMethod' => $authMethod,
+            'roles' => $roles
+        ]);

     }
 
     /**
     }
 
     /**


@@ -202,7 +204,7 @@ class UserController extends Controller
         }
 
         $user->save();
         }
 
         $user->save();

-        $this->showSuccessNotification( trans('settings.users_edit_success'));
+        $this->showSuccessNotification(trans('settings.users_edit_success'));

 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         return redirect($redirectUrl);
 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         return redirect($redirectUrl);


@@ -236,17 +238,17 @@ class UserController extends Controller
         $user = $this->userRepo->getById($id);
 
         if ($this->userRepo->isOnlyAdmin($user)) {
         $user = $this->userRepo->getById($id);
 
         if ($this->userRepo->isOnlyAdmin($user)) {

-            $this->showErrorNotification( trans('errors.users_cannot_delete_only_admin'));
+            $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin'));

             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {
             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {

-            $this->showErrorNotification( trans('errors.users_cannot_delete_guest'));
+            $this->showErrorNotification(trans('errors.users_cannot_delete_guest'));

             return redirect($user->getEditUrl());
         }
 
         $this->userRepo->destroy($user);
             return redirect($user->getEditUrl());
         }
 
         $this->userRepo->destroy($user);

-        $this->showSuccessNotification( trans('settings.users_delete_success'));
+        $this->showSuccessNotification(trans('settings.users_delete_success'));

 
         return redirect('/settings/users');
     }
 
         return redirect('/settings/users');
     }


@@ -261,7 +263,7 @@ class UserController extends Controller
         $user = $this->userRepo->getById($id);
 
         $userActivity = $this->userRepo->getActivity($user);
         $user = $this->userRepo->getById($id);
 
         $userActivity = $this->userRepo->getActivity($user);

-        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
+        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5);

         $assetCounts = $this->userRepo->getAssetCounts($user);
 
         return view('users.profile', [
         $assetCounts = $this->userRepo->getAssetCounts($user);
 
         return view('users.profile', [