Merge pull request #3556 from GongMingCai/development

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

diff --git a/app/Http/Controllers/Auth/UserInviteController.php b/app/Http/Controllers/Auth/UserInviteController.php
index bd1912b0b494313d410be80b0844ec15d6943ede..27b20f831b956d67b6501a4c17a8ee902e645a85 100644 (file)
--- a/app/Http/Controllers/Auth/UserInviteController.php
+++ b/app/Http/Controllers/Auth/UserInviteController.php
@@ -2,7 +2,6 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

-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;


@@ -12,23 +11,22 @@ use Exception;
 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\Validation\Rules\Password;

 
 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, LoginService $loginService, UserRepo $userRepo)
+    public function __construct(UserInviteService $inviteService, 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;
     }
 
         $this->userRepo = $userRepo;
     }
 


@@ -58,7 +56,7 @@ class UserInviteController extends Controller
     public function setPassword(Request $request, string $token)
     {
         $this->validate($request, [
     public function setPassword(Request $request, string $token)
     {
         $this->validate($request, [

-            'password' => 'required|min:8',
+            'password' => ['required', Password::default()],

         ]);
 
         try {
         ]);
 
         try {


@@ -73,10 +71,9 @@ class UserInviteController extends Controller
         $user->save();
 
         $this->inviteService->deleteByUser($user);
         $user->save();
 
         $this->inviteService->deleteByUser($user);

-        $this->showSuccessNotification(trans('auth.user_invite_success', ['appName' => setting('app-name')]));
-        $this->loginService->login($user, auth()->getDefaultDriver());
+        $this->showSuccessNotification(trans('auth.user_invite_success_login', ['appName' => setting('app-name')]));

 
 

-        return redirect('/');
+        return redirect('/login');

     }
 
     /**
     }
 
     /**