X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/be4f3d62cd37c7b83eb86bbf5fffa00d20acf2ec..refs/pull/2270/head:/app/Http/Controllers/Auth/RegisterController.php diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 385994324..0bdeef9e6 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,21 +2,15 @@ namespace BookStack\Http\Controllers\Auth; -use BookStack\Exceptions\SocialSignInAccountNotUsed; -use BookStack\Exceptions\SocialSignInException; +use BookStack\Auth\Access\RegistrationService; +use BookStack\Auth\Access\SocialAuthService; +use BookStack\Auth\User; use BookStack\Exceptions\UserRegistrationException; -use BookStack\Repos\UserRepo; -use BookStack\Services\EmailConfirmationService; -use BookStack\Services\SocialAuthService; -use BookStack\SocialAccount; -use BookStack\User; -use Exception; -use Illuminate\Http\Request; -use Illuminate\Http\Response; -use Validator; use BookStack\Http\Controllers\Controller; use Illuminate\Foundation\Auth\RegistersUsers; -use Laravel\Socialite\Contracts\User as SocialUser; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\Hash; +use Validator; class RegisterController extends Controller { @@ -34,8 +28,7 @@ class RegisterController extends Controller use RegistersUsers; protected $socialAuthService; - protected $emailConfirmationService; - protected $userRepo; + protected $registrationService; /** * Where to redirect users after login / registration. @@ -47,73 +40,69 @@ class RegisterController extends Controller /** * Create a new controller instance. - * - * @param SocialAuthService $socialAuthService - * @param EmailConfirmationService $emailConfirmationService - * @param UserRepo $userRepo */ - public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo) + public function __construct(SocialAuthService $socialAuthService, RegistrationService $registrationService) { - $this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']); + $this->middleware('guest'); + $this->middleware('guard:standard'); + $this->socialAuthService = $socialAuthService; - $this->emailConfirmationService = $emailConfirmationService; - $this->userRepo = $userRepo; - $this->redirectTo = baseUrl('/'); - $this->redirectPath = baseUrl('/'); + $this->registrationService = $registrationService; + + $this->redirectTo = url('/'); + $this->redirectPath = url('/'); parent::__construct(); } /** * Get a validator for an incoming registration request. * - * @param array $data * @return \Illuminate\Contracts\Validation\Validator */ protected function validator(array $data) { return Validator::make($data, [ - 'name' => 'required|max:255', + 'name' => 'required|min:2|max:255', 'email' => 'required|email|max:255|unique:users', - 'password' => 'required|min:6', + 'password' => 'required|min:8', ]); } - /** - * Check whether or not registrations are allowed in the app settings. - * @throws UserRegistrationException - */ - protected function checkRegistrationAllowed() - { - if (!setting('registration-enabled')) { - throw new UserRegistrationException(trans('auth.registrations_disabled'), '/login'); - } - } - /** * Show the application registration form. - * @return Response * @throws UserRegistrationException */ public function getRegister() { - $this->checkRegistrationAllowed(); + $this->registrationService->ensureRegistrationAllowed(); $socialDrivers = $this->socialAuthService->getActiveDrivers(); - return view('auth.register', ['socialDrivers' => $socialDrivers]); + return view('auth.register', [ + 'socialDrivers' => $socialDrivers, + ]); } /** * Handle a registration request for the application. - * @param Request|\Illuminate\Http\Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @throws UserRegistrationException */ public function postRegister(Request $request) { - $this->checkRegistrationAllowed(); + $this->registrationService->ensureRegistrationAllowed(); $this->validator($request->all())->validate(); - $userData = $request->all(); - return $this->registerUser($userData); + + try { + $user = $this->registrationService->registerUser($userData); + auth()->login($user); + } catch (UserRegistrationException $exception) { + if ($exception->getMessage()) { + $this->showErrorNotification($exception->getMessage()); + } + return redirect($exception->redirectLocation); + } + + $this->showSuccessNotification(trans('auth.register_success')); + return redirect($this->redirectPath()); } /** @@ -126,200 +115,8 @@ class RegisterController extends Controller return User::create([ 'name' => $data['name'], 'email' => $data['email'], - 'password' => bcrypt($data['password']), + 'password' => Hash::make($data['password']), ]); } - /** - * The registrations flow for all users. - * @param array $userData - * @param bool|false|SocialAccount $socialAccount - * @param bool $emailVerified - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws UserRegistrationException - */ - protected function registerUser(array $userData, $socialAccount = false, $emailVerified = false) - { - $registrationRestrict = setting('registration-restrict'); - - if ($registrationRestrict) { - $restrictedEmailDomains = explode(',', str_replace(' ', '', $registrationRestrict)); - $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1); - if (!in_array($userEmailDomain, $restrictedEmailDomains)) { - throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), '/register'); - } - } - - $newUser = $this->userRepo->registerNew($userData, $emailVerified); - if ($socialAccount) { - $newUser->socialAccounts()->save($socialAccount); - } - - if ((setting('registration-confirmation') || $registrationRestrict) && !$emailVerified) { - $newUser->save(); - - try { - $this->emailConfirmationService->sendConfirmation($newUser); - } catch (Exception $e) { - session()->flash('error', trans('auth.email_confirm_send_error')); - } - - return redirect('/register/confirm'); - } - - auth()->login($newUser); - session()->flash('success', trans('auth.register_success')); - return redirect($this->redirectPath()); - } - - /** - * Show the page to tell the user to check their email - * and confirm their address. - */ - public function getRegisterConfirmation() - { - return view('auth/register-confirm'); - } - - /** - * Confirms an email via a token and logs the user into the system. - * @param $token - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws UserRegistrationException - */ - public function confirmEmail($token) - { - $confirmation = $this->emailConfirmationService->getEmailConfirmationFromToken($token); - $user = $confirmation->user; - $user->email_confirmed = true; - $user->save(); - auth()->login($user); - session()->flash('success', trans('auth.email_confirm_success')); - $this->emailConfirmationService->deleteConfirmationsByUser($user); - return redirect($this->redirectPath); - } - - /** - * Shows a notice that a user's email address has not been confirmed, - * Also has the option to re-send the confirmation email. - * @return \Illuminate\View\View - */ - public function showAwaitingConfirmation() - { - return view('auth/user-unconfirmed'); - } - - /** - * Resend the confirmation email - * @param Request $request - * @return \Illuminate\View\View - */ - public function resendConfirmation(Request $request) - { - $this->validate($request, [ - 'email' => 'required|email|exists:users,email' - ]); - $user = $this->userRepo->getByEmail($request->get('email')); - - try { - $this->emailConfirmationService->sendConfirmation($user); - } catch (Exception $e) { - session()->flash('error', trans('auth.email_confirm_send_error')); - return redirect('/register/confirm'); - } - - session()->flash('success', trans('auth.email_confirm_resent')); - return redirect('/register/confirm'); - } - - /** - * Redirect to the social site for authentication intended to register. - * @param $socialDriver - * @return mixed - * @throws UserRegistrationException - * @throws \BookStack\Exceptions\SocialDriverNotConfigured - */ - public function socialRegister($socialDriver) - { - $this->checkRegistrationAllowed(); - session()->put('social-callback', 'register'); - return $this->socialAuthService->startRegister($socialDriver); - } - - /** - * The callback for social login services. - * @param $socialDriver - * @param Request $request - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws SocialSignInException - * @throws UserRegistrationException - * @throws \BookStack\Exceptions\SocialDriverNotConfigured - */ - public function socialCallback($socialDriver, Request $request) - { - if (!session()->has('social-callback')) { - throw new SocialSignInException(trans('errors.social_no_action_defined'), '/login'); - } - - // Check request for error information - if ($request->has('error') && $request->has('error_description')) { - throw new SocialSignInException(trans('errors.social_login_bad_response', [ - 'socialAccount' => $socialDriver, - 'error' => $request->get('error_description'), - ]), '/login'); - } - - $action = session()->pull('social-callback'); - - // Attempt login or fall-back to register if allowed. - $socialUser = $this->socialAuthService->getSocialUser($socialDriver); - if ($action == 'login') { - try { - return $this->socialAuthService->handleLoginCallback($socialDriver, $socialUser); - } catch (SocialSignInAccountNotUsed $exception) { - if ($this->socialAuthService->driverAutoRegisterEnabled($socialDriver)) { - return $this->socialRegisterCallback($socialDriver, $socialUser); - } - throw $exception; - } - } - - if ($action == 'register') { - return $this->socialRegisterCallback($socialDriver, $socialUser); - } - - return redirect()->back(); - } - - /** - * Detach a social account from a user. - * @param $socialDriver - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - */ - public function detachSocialAccount($socialDriver) - { - return $this->socialAuthService->detachSocialAccount($socialDriver); - } - - /** - * Register a new user after a registration callback. - * @param string $socialDriver - * @param SocialUser $socialUser - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * @throws UserRegistrationException - */ - protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser) - { - $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser); - $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser); - $emailVerified = $this->socialAuthService->driverAutoConfirmEmailEnabled($socialDriver); - - // Create an array of the user data to create a new user instance - $userData = [ - 'name' => $socialUser->getName(), - 'email' => $socialUser->getEmail(), - 'password' => str_random(30) - ]; - return $this->registerUser($userData, $socialAccount, $emailVerified); - } }