Fixes for CodeStyle vol.2

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index d797552f12d9442d978c502c9402c8c4c371a768..a0da220ee55f9735884bc5befe09677718732bf7 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,4 +1,6 @@
-<?php namespace BookStack\Http\Controllers;
+<?php
+
+namespace BookStack\Http\Controllers;

 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\Access\SocialAuthService;
 
 use BookStack\Actions\ActivityType;
 use BookStack\Auth\Access\SocialAuthService;


@@ -15,7 +17,6 @@ use Illuminate\Validation\ValidationException;
 
 class UserController extends Controller
 {
 
 class UserController extends Controller
 {

-

     protected $user;
     protected $userRepo;
     protected $inviteService;
     protected $user;
     protected $userRepo;
     protected $inviteService;


@@ -39,14 +40,15 @@ class UserController extends Controller
     {
         $this->checkPermission('users-manage');
         $listDetails = [
     {
         $this->checkPermission('users-manage');
         $listDetails = [

-            'order' => $request->get('order', 'asc'),
+            'order'  => $request->get('order', 'asc'),

             'search' => $request->get('search', ''),
             'search' => $request->get('search', ''),

-            'sort' => $request->get('sort', 'name'),
+            'sort'   => $request->get('sort', 'name'),

         ];
         $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
 
         $this->setPageTitle(trans('settings.users'));
         $users->appends($listDetails);
         ];
         $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
 
         $this->setPageTitle(trans('settings.users'));
         $users->appends($listDetails);

+

         return view('users.index', ['users' => $users, 'listDetails' => $listDetails]);
     }
 
         return view('users.index', ['users' => $users, 'listDetails' => $listDetails]);
     }
 


@@ -58,11 +60,13 @@ class UserController extends Controller
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');
         $roles = $this->userRepo->getAllRoles();
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');
         $roles = $this->userRepo->getAllRoles();

+

         return view('users.create', ['authMethod' => $authMethod, 'roles' => $roles]);
     }
 
     /**
      * Store a newly created user in storage.
         return view('users.create', ['authMethod' => $authMethod, 'roles' => $roles]);
     }
 
     /**
      * Store a newly created user in storage.

+     *

      * @throws UserUpdateException
      * @throws ValidationException
      */
      * @throws UserUpdateException
      * @throws ValidationException
      */


@@ -71,7 +75,7 @@ class UserController extends Controller
         $this->checkPermission('users-manage');
         $validationRules = [
             'name'  => 'required',
         $this->checkPermission('users-manage');
         $validationRules = [
             'name'  => 'required',

-            'email' => 'required|email|unique:users,email'
+            'email' => 'required|email|unique:users,email',

         ];
 
         $authMethod = config('auth.method');
         ];
 
         $authMethod = config('auth.method');


@@ -108,6 +112,7 @@ class UserController extends Controller
         $this->userRepo->downloadAndAssignUserAvatar($user);
 
         $this->logActivity(ActivityType::USER_CREATE, $user);
         $this->userRepo->downloadAndAssignUserAvatar($user);
 
         $this->logActivity(ActivityType::USER_CREATE, $user);

+

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


@@ -118,23 +123,28 @@ class UserController extends Controller
     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 

-        $user = $this->user->newQuery()->with(['apiTokens'])->findOrFail($id);
+        /** @var User $user */
+        $user = $this->user->newQuery()->with(['apiTokens', 'mfaValues'])->findOrFail($id);

 
         $authMethod = ($user->system_name) ? 'system' : config('auth.method');
 
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
 
         $authMethod = ($user->system_name) ? 'system' : config('auth.method');
 
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();

+        $mfaMethods = $user->mfaValues->groupBy('method');

         $this->setPageTitle(trans('settings.user_profile'));
         $roles = $this->userRepo->getAllRoles();
         $this->setPageTitle(trans('settings.user_profile'));
         $roles = $this->userRepo->getAllRoles();

+

         return view('users.edit', [
         return view('users.edit', [

-            'user' => $user,
+            'user'                => $user,

             'activeSocialDrivers' => $activeSocialDrivers,
             'activeSocialDrivers' => $activeSocialDrivers,

-            'authMethod' => $authMethod,
-            'roles' => $roles
+            'mfaMethods'          => $mfaMethods,
+            'authMethod'          => $authMethod,
+            'roles'               => $roles,

         ]);
     }
 
     /**
      * Update the specified user in storage.
         ]);
     }
 
     /**
      * Update the specified user in storage.

+     *

      * @throws UserUpdateException
      * @throws ImageUploadException
      * @throws ValidationException
      * @throws UserUpdateException
      * @throws ImageUploadException
      * @throws ValidationException


@@ -208,6 +218,7 @@ class UserController extends Controller
         $this->logActivity(ActivityType::USER_UPDATE, $user);
 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         $this->logActivity(ActivityType::USER_UPDATE, $user);
 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);

+

         return redirect($redirectUrl);
     }
 
         return redirect($redirectUrl);
     }
 


@@ -220,11 +231,13 @@ class UserController extends Controller
 
         $user = $this->userRepo->getById($id);
         $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));
 
         $user = $this->userRepo->getById($id);
         $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));

+

         return view('users.delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.
         return view('users.delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.

+     *

      * @throws Exception
      */
     public function destroy(Request $request, int $id)
      * @throws Exception
      */
     public function destroy(Request $request, int $id)


@@ -237,11 +250,13 @@ class UserController extends Controller
 
         if ($this->userRepo->isOnlyAdmin($user)) {
             $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin'));
 
         if ($this->userRepo->isOnlyAdmin($user)) {
             $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin'));

+

             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {
             $this->showErrorNotification(trans('errors.users_cannot_delete_guest'));
             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {
             $this->showErrorNotification(trans('errors.users_cannot_delete_guest'));

+

             return redirect($user->getEditUrl());
         }
 
             return redirect($user->getEditUrl());
         }
 


@@ -300,10 +315,11 @@ class UserController extends Controller
      */
     public function changeSort(Request $request, string $id, string $type)
     {
      */
     public function changeSort(Request $request, string $id, string $type)
     {

-        $validSortTypes = ['books', 'bookshelves'];
+        $validSortTypes = ['books', 'bookshelves', 'shelf_books'];

         if (!in_array($type, $validSortTypes)) {
             return redirect()->back(500);
         }
         if (!in_array($type, $validSortTypes)) {
             return redirect()->back(500);
         }

+

         return $this->changeListSort($id, $request, $type);
     }
 
         return $this->changeListSort($id, $request, $type);
     }
 


@@ -314,6 +330,7 @@ class UserController extends Controller
     {
         $enabled = setting()->getForCurrentUser('dark-mode-enabled', false);
         setting()->putUser(user(), 'dark-mode-enabled', $enabled ? 'false' : 'true');
     {
         $enabled = setting()->getForCurrentUser('dark-mode-enabled', false);
         setting()->putUser(user(), 'dark-mode-enabled', $enabled ? 'false' : 'true');

+

         return redirect()->back();
     }
 
         return redirect()->back();
     }
 


@@ -325,14 +342,15 @@ class UserController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $id);
         $keyWhitelist = ['home-details'];
         if (!in_array($key, $keyWhitelist)) {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
         $keyWhitelist = ['home-details'];
         if (!in_array($key, $keyWhitelist)) {

-            return response("Invalid key", 500);
+            return response('Invalid key', 500);

         }
 
         $newState = $request->get('expand', 'false');
 
         $user = $this->user->findOrFail($id);
         setting()->putUser($user, 'section_expansion#' . $key, $newState);
         }
 
         $newState = $request->get('expand', 'false');
 
         $user = $this->user->findOrFail($id);
         setting()->putUser($user, 'section_expansion#' . $key, $newState);

-        return response("", 204);
+
+        return response('', 204);

     }
 
     /**
     }
 
     /**


@@ -343,7 +361,7 @@ class UserController extends Controller
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $sort = $request->get('sort');
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
         $sort = $request->get('sort');

-        if (!in_array($sort, ['name', 'created_at', 'updated_at'])) {
+        if (!in_array($sort, ['name', 'created_at', 'updated_at', 'default'])) {

             $sort = 'name';
         }
 
             $sort = 'name';
         }