github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-06-02 23:56:56 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Added MFA indicator to user list

Browse Source 
Also fixed issue with showing incorrect MFA method count on user edit
page changes done in last commit
This commit is contained in:
Dan Brown
2021-07-14 20:18:48 +01:00
parent bb43acef21
commit cfc0c593db
5 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/UserController.php
View File

@ -123,12 +123,13 @@ class UserController extends Controller
{
$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();
$mfaMethods = user()->mfaValues()->get(['id', 'method'])->groupBy('method');
$mfaMethods = $user->mfaValues->groupBy('method');
$this->setPageTitle(trans('settings.user_profile'));
$roles = $this->userRepo->getAllRoles();