X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/cac31b2074cc0429423ffe7b8646ca0b5b367fe6..refs/pull/3693/head:/app/Http/Controllers/Auth/MfaBackupCodesController.php diff --git a/app/Http/Controllers/Auth/MfaBackupCodesController.php b/app/Http/Controllers/Auth/MfaBackupCodesController.php index 4b4e11659..4ceb394b0 100644 --- a/app/Http/Controllers/Auth/MfaBackupCodesController.php +++ b/app/Http/Controllers/Auth/MfaBackupCodesController.php @@ -20,7 +20,7 @@ class MfaBackupCodesController extends Controller protected const SETUP_SECRET_SESSION_KEY = 'mfa-setup-backup-codes'; /** - * Show a view that generates and displays backup codes + * Show a view that generates and displays backup codes. */ public function generate(BackupCodeService $codeService) { @@ -29,14 +29,17 @@ class MfaBackupCodesController extends Controller $downloadUrl = 'data:application/octet-stream;base64,' . base64_encode(implode("\n\n", $codes)); + $this->setPageTitle(trans('auth.mfa_gen_backup_codes_title')); + return view('mfa.backup-codes-generate', [ - 'codes' => $codes, + 'codes' => $codes, 'downloadUrl' => $downloadUrl, ]); } /** * Confirm the setup of backup codes, storing them against the user. + * * @throws Exception */ public function confirm() @@ -52,6 +55,7 @@ class MfaBackupCodesController extends Controller if (!auth()->check()) { $this->showSuccessNotification(trans('auth.mfa_setup_login_notification')); + return redirect('/login'); } @@ -60,6 +64,7 @@ class MfaBackupCodesController extends Controller /** * Verify the MFA method submission on check. + * * @throws NotFoundException * @throws ValidationException */ @@ -70,14 +75,13 @@ class MfaBackupCodesController extends Controller $this->validate($request, [ 'code' => [ - 'required', - 'max:12', 'min:8', + 'required', 'max:12', 'min:8', function ($attribute, $value, $fail) use ($codeService, $codes) { if (!$codeService->inputCodeExistsInSet($value, $codes)) { $fail(trans('validation.backup_codes')); } - } - ] + }, + ], ]); $updatedCodes = $codeService->removeInputCodeFromSet($request->get('code'), $codes);