Applied StyleCI changes, added php/larastan to attribution

[bookstack] / app / Http / Controllers / Auth / ConfirmEmailController.php

diff --git a/app/Http/Controllers/Auth/ConfirmEmailController.php b/app/Http/Controllers/Auth/ConfirmEmailController.php
index c4280448e91c037f04a2e62d1df6a9d50708c7da..c5466aecd5ae8c11e735798bdd7c7ce7c59314b5 100644 (file)
--- a/app/Http/Controllers/Auth/ConfirmEmailController.php
+++ b/app/Http/Controllers/Auth/ConfirmEmailController.php
@@ -28,8 +28,7 @@ class ConfirmEmailController extends Controller
         EmailConfirmationService $emailConfirmationService,
         LoginService $loginService,
         UserRepo $userRepo
-    )
-    {
+    ) {
         $this->emailConfirmationService = $emailConfirmationService;
         $this->loginService = $loginService;
         $this->userRepo = $userRepo;
@@ -47,12 +46,12 @@ class ConfirmEmailController extends Controller
     /**
      * Shows a notice that a user's email address has not been confirmed,
      * Also has the option to re-send the confirmation email.
-     *
-     * @return View
      */
     public function showAwaiting()
     {
-        return view('auth.user-unconfirmed');
+        $user = $this->loginService->getLastLoginAttemptUser();
+
+        return view('auth.user-unconfirmed', ['user' => $user]);
     }
 
     /**
@@ -108,7 +107,7 @@ class ConfirmEmailController extends Controller
     public function resend(Request $request)
     {
         $this->validate($request, [
-            'email' => 'required|email|exists:users,email',
+            'email' => ['required', 'email', 'exists:users,email'],
         ]);
         $user = $this->userRepo->getByEmail($request->get('email'));