Updated all login events to route through single service

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

diff --git a/app/Http/Controllers/Auth/UserInviteController.php b/app/Http/Controllers/Auth/UserInviteController.php
index ab745224836d4e82477e0513999d049c07a4528f..1cc59d6ba0c04398c948c41d42a97b7be31f3195 100644 (file)
--- a/app/Http/Controllers/Auth/UserInviteController.php
+++ b/app/Http/Controllers/Auth/UserInviteController.php
@@ -3,6 +3,7 @@
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Actions\ActivityType;
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Actions\ActivityType;

+use BookStack\Auth\Access\LoginService;

 use BookStack\Auth\Access\UserInviteService;
 use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Auth\Access\UserInviteService;
 use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserTokenExpiredException;


@@ -18,22 +19,25 @@ use Illuminate\Routing\Redirector;
 class UserInviteController extends Controller
 {
     protected $inviteService;
 class UserInviteController extends Controller
 {
     protected $inviteService;

+    protected $loginService;

     protected $userRepo;
 
     /**
      * Create a new controller instance.
      */
     protected $userRepo;
 
     /**
      * Create a new controller instance.
      */

-    public function __construct(UserInviteService $inviteService, UserRepo $userRepo)
+    public function __construct(UserInviteService $inviteService, LoginService $loginService, UserRepo $userRepo)

     {
         $this->middleware('guest');
         $this->middleware('guard:standard');
 
         $this->inviteService = $inviteService;
     {
         $this->middleware('guest');
         $this->middleware('guard:standard');
 
         $this->inviteService = $inviteService;

+        $this->loginService = $loginService;

         $this->userRepo = $userRepo;
     }
 
     /**
      * Show the page for the user to set the password for their account.
         $this->userRepo = $userRepo;
     }
 
     /**
      * Show the page for the user to set the password for their account.

+     *

      * @throws Exception
      */
     public function showSetPassword(string $token)
      * @throws Exception
      */
     public function showSetPassword(string $token)


@@ -51,12 +55,13 @@ class UserInviteController extends Controller
 
     /**
      * Sets the password for an invited user and then grants them access.
 
     /**
      * Sets the password for an invited user and then grants them access.

+     *

      * @throws Exception
      */
     public function setPassword(Request $request, string $token)
     {
         $this->validate($request, [
      * @throws Exception
      */
     public function setPassword(Request $request, string $token)
     {
         $this->validate($request, [

-            'password' => 'required|min:8'
+            'password' => 'required|min:8',

         ]);
 
         try {
         ]);
 
         try {


@@ -70,9 +75,7 @@ class UserInviteController extends Controller
         $user->email_confirmed = true;
         $user->save();
 
         $user->email_confirmed = true;
         $user->save();
 

-        auth()->login($user);
-        Theme::dispatch(ThemeEvents::AUTH_LOGIN, auth()->getDefaultDriver(), $user);
-        $this->logActivity(ActivityType::AUTH_LOGIN, $user);
+        $this->loginService->login($user, auth()->getDefaultDriver());

         $this->showSuccessNotification(trans('auth.user_invite_success', ['appName' => setting('app-name')]));
         $this->inviteService->deleteByUser($user);
 
         $this->showSuccessNotification(trans('auth.user_invite_success', ['appName' => setting('app-name')]));
         $this->inviteService->deleteByUser($user);
 


@@ -81,8 +84,10 @@ class UserInviteController extends Controller
 
     /**
      * Check and validate the exception thrown when checking an invite token.
 
     /**
      * Check and validate the exception thrown when checking an invite token.

-     * @return RedirectResponse|Redirector
+     *

      * @throws Exception
      * @throws Exception

+     *
+     * @return RedirectResponse|Redirector

      */
     protected function handleTokenException(Exception $exception)
     {
      */
     protected function handleTokenException(Exception $exception)
     {


@@ -92,6 +97,7 @@ class UserInviteController extends Controller
 
         if ($exception instanceof UserTokenExpiredException) {
             $this->showErrorNotification(trans('errors.invite_token_expired'));
 
         if ($exception instanceof UserTokenExpiredException) {
             $this->showErrorNotification(trans('errors.invite_token_expired'));

+

             return redirect('/password/email');
         }
 
             return redirect('/password/email');
         }