namespace BookStack\Http\Controllers\Auth;
-use BookStack\Auth\Access\LoginService;
use BookStack\Auth\Access\UserInviteService;
use BookStack\Auth\UserRepo;
use BookStack\Exceptions\UserTokenExpiredException;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Routing\Redirector;
+use Illuminate\Validation\Rules\Password;
class UserInviteController extends Controller
{
protected $inviteService;
- protected $loginService;
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->loginService = $loginService;
$this->userRepo = $userRepo;
}
public function setPassword(Request $request, string $token)
{
$this->validate($request, [
- 'password' => 'required|min:8',
+ 'password' => ['required', Password::default()],
]);
try {
$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');
}
/**