Added shelve icon, improved migration, added role permission

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

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index d3c1efb680564713d9e48e03524c209661e782d4..1bbd5e2ba5e2b6bcd8d9527742978d70a20e3188 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -91,6 +91,7 @@ class RegisterController extends Controller
     /**
      * Show the application registration form.
      * @return Response
     /**
      * Show the application registration form.
      * @return Response

+     * @throws UserRegistrationException

      */
     public function getRegister()
     {
      */
     public function getRegister()
     {


@@ -102,21 +103,13 @@ class RegisterController extends Controller
     /**
      * Handle a registration request for the application.
      * @param Request|\Illuminate\Http\Request $request
     /**
      * Handle a registration request for the application.
      * @param Request|\Illuminate\Http\Request $request

-     * @return Response
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

      * @throws UserRegistrationException
      * @throws UserRegistrationException

-     * @throws \Illuminate\Validation\ValidationException

      */
     public function postRegister(Request $request)
     {
         $this->checkRegistrationAllowed();
      */
     public function postRegister(Request $request)
     {
         $this->checkRegistrationAllowed();

-        $validator = $this->validator($request->all());
-
-        if ($validator->fails()) {
-            $this->throwValidationException(
-                $request,
-                $validator
-            );
-        }
+        $this->validator($request->all())->validate();

 
         $userData = $request->all();
         return $this->registerUser($userData);
 
         $userData = $request->all();
         return $this->registerUser($userData);


@@ -142,7 +135,6 @@ class RegisterController extends Controller
      * @param bool|false|SocialAccount $socialAccount
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws UserRegistrationException
      * @param bool|false|SocialAccount $socialAccount
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws UserRegistrationException

-     * @throws ConfirmationEmailException

      */
     protected function registerUser(array $userData, $socialAccount = false)
     {
      */
     protected function registerUser(array $userData, $socialAccount = false)
     {


@@ -240,6 +232,8 @@ class RegisterController extends Controller
      * Redirect to the social site for authentication intended to register.
      * @param $socialDriver
      * @return mixed
      * Redirect to the social site for authentication intended to register.
      * @param $socialDriver
      * @return mixed

+     * @throws UserRegistrationException
+     * @throws \BookStack\Exceptions\SocialDriverNotConfigured

      */
     public function socialRegister($socialDriver)
     {
      */
     public function socialRegister($socialDriver)
     {


@@ -296,7 +290,6 @@ class RegisterController extends Controller
      * Register a new user after a registration callback.
      * @param $socialDriver
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * Register a new user after a registration callback.
      * @param $socialDriver
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector

-     * @throws ConfirmationEmailException

      * @throws UserRegistrationException
      * @throws \BookStack\Exceptions\SocialDriverNotConfigured
      */
      * @throws UserRegistrationException
      * @throws \BookStack\Exceptions\SocialDriverNotConfigured
      */