Merge branch 'feature/public-login-redirect' of git://github.com/Xiphoseer/BookStack...

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

diff --git a/app/Http/Controllers/Auth/UserInviteController.php b/app/Http/Controllers/Auth/UserInviteController.php
index 5d9373f452c183eab30d5c871a93797b0165e07c..c61b1c42b688e58b8c6defd8c007f8db7a099009 100644 (file)
--- a/app/Http/Controllers/Auth/UserInviteController.php
+++ b/app/Http/Controllers/Auth/UserInviteController.php
@@ -8,11 +8,9 @@ use BookStack\Exceptions\UserTokenExpiredException;
 use BookStack\Exceptions\UserTokenNotFoundException;
 use BookStack\Http\Controllers\Controller;
 use Exception;
 use BookStack\Exceptions\UserTokenNotFoundException;
 use BookStack\Http\Controllers\Controller;
 use Exception;

-use Illuminate\Contracts\View\Factory;

 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Redirector;

-use Illuminate\View\View;

 
 class UserInviteController extends Controller
 {
 
 class UserInviteController extends Controller
 {


@@ -21,22 +19,20 @@ class UserInviteController extends Controller
 
     /**
      * Create a new controller instance.
 
     /**
      * Create a new controller instance.

-     *
-     * @param UserInviteService $inviteService
-     * @param UserRepo $userRepo

      */
     public function __construct(UserInviteService $inviteService, UserRepo $userRepo)
     {
      */
     public function __construct(UserInviteService $inviteService, UserRepo $userRepo)
     {

+        $this->middleware('guest');
+        $this->middleware('guard:standard');
+

         $this->inviteService = $inviteService;
         $this->userRepo = $userRepo;
         $this->inviteService = $inviteService;
         $this->userRepo = $userRepo;

-        $this->middleware('guest');
+

         parent::__construct();
     }
 
     /**
      * Show the page for the user to set the password for their account.
         parent::__construct();
     }
 
     /**
      * Show the page for the user to set the password for their account.

-     * @param string $token
-     * @return Factory|View|RedirectResponse

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


@@ -54,15 +50,12 @@ 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.

-     * @param string $token
-     * @param Request $request
-     * @return RedirectResponse|Redirector

      * @throws Exception
      */
      * @throws Exception
      */

-    public function setPassword(string $token, Request $request)
+    public function setPassword(Request $request, string $token)

     {
         $this->validate($request, [
     {
         $this->validate($request, [

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

         ]);
 
         try {
         ]);
 
         try {


@@ -77,7 +70,7 @@ class UserInviteController extends Controller
         $user->save();
 
         auth()->login($user);
         $user->save();
 
         auth()->login($user);

-        session()->flash('success', trans('auth.user_invite_success', ['appName' => setting('app-name')]));
+        $this->showSuccessNotification(trans('auth.user_invite_success', ['appName' => setting('app-name')]));

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


@@ -85,7 +78,6 @@ 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.

-     * @param Exception $exception

      * @return RedirectResponse|Redirector
      * @throws Exception
      */
      * @return RedirectResponse|Redirector
      * @throws Exception
      */


@@ -96,11 +88,10 @@ class UserInviteController extends Controller
         }
 
         if ($exception instanceof UserTokenExpiredException) {
         }
 
         if ($exception instanceof UserTokenExpiredException) {

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

             return redirect('/password/email');
         }
 
         throw $exception;
     }
             return redirect('/password/email');
         }
 
         throw $exception;
     }

-

 }
 }