Updated npm dependancies

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

diff --git a/app/Http/Controllers/Auth/ConfirmEmailController.php b/app/Http/Controllers/Auth/ConfirmEmailController.php
index 3e240b94efa845385320d0b48fc17b8a5b2edfaf..099558eb77fdce133b307aaac327277bc02510f8 100644 (file)
--- a/app/Http/Controllers/Auth/ConfirmEmailController.php
+++ b/app/Http/Controllers/Auth/ConfirmEmailController.php
@@ -64,16 +64,15 @@ class ConfirmEmailController extends Controller
         try {
             $userId = $this->emailConfirmationService->checkTokenAndGetUserId($token);
         } catch (Exception $exception) {
         try {
             $userId = $this->emailConfirmationService->checkTokenAndGetUserId($token);
         } catch (Exception $exception) {

-

             if ($exception instanceof UserTokenNotFoundException) {
             if ($exception instanceof UserTokenNotFoundException) {

-                session()->flash('error', trans('errors.email_confirmation_invalid'));
+                $this->showErrorNotification(trans('errors.email_confirmation_invalid'));

                 return redirect('/register');
             }
 
             if ($exception instanceof UserTokenExpiredException) {
                 $user = $this->userRepo->getById($exception->userId);
                 $this->emailConfirmationService->sendConfirmation($user);
                 return redirect('/register');
             }
 
             if ($exception instanceof UserTokenExpiredException) {
                 $user = $this->userRepo->getById($exception->userId);
                 $this->emailConfirmationService->sendConfirmation($user);

-                session()->flash('error', trans('errors.email_confirmation_expired'));
+                $this->showErrorNotification(trans('errors.email_confirmation_expired'));

                 return redirect('/register/confirm');
             }
 
                 return redirect('/register/confirm');
             }
 


@@ -85,7 +84,7 @@ class ConfirmEmailController extends Controller
         $user->save();
 
         auth()->login($user);
         $user->save();
 
         auth()->login($user);

-        session()->flash('success', trans('auth.email_confirm_success'));
+        $this->showSuccessNotification(trans('auth.email_confirm_success'));

         $this->emailConfirmationService->deleteByUser($user);
 
         return redirect('/');
         $this->emailConfirmationService->deleteByUser($user);
 
         return redirect('/');


@@ -107,12 +106,11 @@ class ConfirmEmailController extends Controller
         try {
             $this->emailConfirmationService->sendConfirmation($user);
         } catch (Exception $e) {
         try {
             $this->emailConfirmationService->sendConfirmation($user);
         } catch (Exception $e) {

-            session()->flash('error', trans('auth.email_confirm_send_error'));
+            $this->showErrorNotification(trans('auth.email_confirm_send_error'));

             return redirect('/register/confirm');
         }
 
             return redirect('/register/confirm');
         }
 

-        session()->flash('success', trans('auth.email_confirm_resent'));
+        $this->showSuccessNotification(trans('auth.email_confirm_resent'));

         return redirect('/register/confirm');
     }
         return redirect('/register/confirm');
     }

-

 }
 }