added routes for zip export

[bookstack] / app / Access / Controllers / MfaTotpController.php

diff --git a/app/Access/Controllers/MfaTotpController.php b/app/Access/Controllers/MfaTotpController.php
index 47be548f977dcfcce8d92fde58392e2b2a25dec9..5202fedc04f925c09c36a0d1e1720ea7c4b4158d 100644 (file)
--- a/app/Access/Controllers/MfaTotpController.php
+++ b/app/Access/Controllers/MfaTotpController.php
@@ -9,7 +9,7 @@ use BookStack\Access\Mfa\TotpService;
 use BookStack\Access\Mfa\TotpValidationRule;
 use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\NotFoundException;
 use BookStack\Access\Mfa\TotpValidationRule;
 use BookStack\Activity\ActivityType;
 use BookStack\Exceptions\NotFoundException;

-use BookStack\Http\Controllers\Controller;
+use BookStack\Http\Controller;

 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 


@@ -19,20 +19,25 @@ class MfaTotpController extends Controller
 
     protected const SETUP_SECRET_SESSION_KEY = 'mfa-setup-totp-secret';
 
 
     protected const SETUP_SECRET_SESSION_KEY = 'mfa-setup-totp-secret';
 

+    public function __construct(
+        protected TotpService $totp
+    ) {
+    }
+

     /**
      * Show a view that generates and displays a TOTP QR code.
      */
     /**
      * Show a view that generates and displays a TOTP QR code.
      */

-    public function generate(TotpService $totp)
+    public function generate()

     {
         if (session()->has(static::SETUP_SECRET_SESSION_KEY)) {
             $totpSecret = decrypt(session()->get(static::SETUP_SECRET_SESSION_KEY));
         } else {
     {
         if (session()->has(static::SETUP_SECRET_SESSION_KEY)) {
             $totpSecret = decrypt(session()->get(static::SETUP_SECRET_SESSION_KEY));
         } else {

-            $totpSecret = $totp->generateSecret();
+            $totpSecret = $this->totp->generateSecret();

             session()->put(static::SETUP_SECRET_SESSION_KEY, encrypt($totpSecret));
         }
 
             session()->put(static::SETUP_SECRET_SESSION_KEY, encrypt($totpSecret));
         }
 

-        $qrCodeUrl = $totp->generateUrl($totpSecret, $this->currentOrLastAttemptedUser());
-        $svg = $totp->generateQrCodeSvg($qrCodeUrl);
+        $qrCodeUrl = $this->totp->generateUrl($totpSecret, $this->currentOrLastAttemptedUser());
+        $svg = $this->totp->generateQrCodeSvg($qrCodeUrl);

 
         $this->setPageTitle(trans('auth.mfa_gen_totp_title'));
 
 
         $this->setPageTitle(trans('auth.mfa_gen_totp_title'));
 


@@ -56,7 +61,7 @@ class MfaTotpController extends Controller
             'code' => [
                 'required',
                 'max:12', 'min:4',
             'code' => [
                 'required',
                 'max:12', 'min:4',

-                new TotpValidationRule($totpSecret),
+                new TotpValidationRule($totpSecret, $this->totp),

             ],
         ]);
 
             ],
         ]);
 


@@ -87,7 +92,7 @@ class MfaTotpController extends Controller
             'code' => [
                 'required',
                 'max:12', 'min:4',
             'code' => [
                 'required',
                 'max:12', 'min:4',

-                new TotpValidationRule($totpSecret),
+                new TotpValidationRule($totpSecret, $this->totp),

             ],
         ]);
 
             ],
         ]);