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 6bba6de045f8d371e3f5b5d92d59b093ddd90df5..1bbd5e2ba5e2b6bcd8d9527742978d70a20e3188 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -3,10 +3,12 @@
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Exceptions\ConfirmationEmailException;
 namespace BookStack\Http\Controllers\Auth;
 
 use BookStack\Exceptions\ConfirmationEmailException;

+use BookStack\Exceptions\SocialSignInException;

 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\EmailConfirmationService;
 use BookStack\Services\SocialAuthService;
 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 BookStack\User;
 use Exception;
 use Illuminate\Http\Request;


@@ -51,7 +53,7 @@ class RegisterController extends Controller
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {
      */
     public function __construct(SocialAuthService $socialAuthService, EmailConfirmationService $emailConfirmationService, UserRepo $userRepo)
     {

-        $this->middleware('guest');
+        $this->middleware('guest')->only(['getRegister', 'postRegister', 'socialRegister']);

         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;
         $this->socialAuthService = $socialAuthService;
         $this->emailConfirmationService = $emailConfirmationService;
         $this->userRepo = $userRepo;


@@ -82,13 +84,14 @@ class RegisterController extends Controller
     protected function checkRegistrationAllowed()
     {
         if (!setting('registration-enabled')) {
     protected function checkRegistrationAllowed()
     {
         if (!setting('registration-enabled')) {

-            throw new UserRegistrationException('Registrations are currently disabled.', '/login');
+            throw new UserRegistrationException(trans('auth.registrations_disabled'), '/login');

         }
     }
 
     /**
      * Show the application registration form.
      * @return Response
         }
     }
 
     /**
      * Show the application registration form.
      * @return Response

+     * @throws UserRegistrationException

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


@@ -100,20 +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\Foundation\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);


@@ -139,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)
     {


@@ -147,7 +142,7 @@ class RegisterController extends Controller
             $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
             $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {
             $restrictedEmailDomains = explode(',', str_replace(' ', '', setting('registration-restrict')));
             $userEmailDomain = $domain = substr(strrchr($userData['email'], "@"), 1);
             if (!in_array($userEmailDomain, $restrictedEmailDomains)) {

-                throw new UserRegistrationException('That email domain does not have access to this application', '/register');
+                throw new UserRegistrationException(trans('auth.registration_email_domain_invalid'), '/register');

             }
         }
 
             }
         }
 


@@ -169,7 +164,7 @@ class RegisterController extends Controller
         }
 
         auth()->login($newUser);
         }
 
         auth()->login($newUser);

-        session()->flash('success', 'Thanks for signing up! You are now registered and signed in.');
+        session()->flash('success', trans('auth.register_success'));

         return redirect($this->redirectPath());
     }
 
         return redirect($this->redirectPath());
     }
 


@@ -229,7 +224,6 @@ class RegisterController extends Controller
             return redirect('/register/confirm');
         }
 
             return redirect('/register/confirm');
         }
 

-        $this->emailConfirmationService->sendConfirmation($user);

         session()->flash('success', trans('auth.email_confirm_resent'));
         return redirect('/register/confirm');
     }
         session()->flash('success', trans('auth.email_confirm_resent'));
         return redirect('/register/confirm');
     }


@@ -238,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)
     {


@@ -249,20 +245,33 @@ class RegisterController extends Controller
     /**
      * The callback for social login services.
      * @param $socialDriver
     /**
      * The callback for social login services.
      * @param $socialDriver

+     * @param Request $request

      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws SocialSignInException
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws SocialSignInException

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

      */
      */

-    public function socialCallback($socialDriver)
+    public function socialCallback($socialDriver, Request $request)

     {
     {

-        if (session()->has('social-callback')) {
-            $action = session()->pull('social-callback');
-            if ($action == 'login') {
-                return $this->socialAuthService->handleLoginCallback($socialDriver);
-            } elseif ($action == 'register') {
-                return $this->socialRegisterCallback($socialDriver);
-            }
-        } else {
-            throw new SocialSignInException('No action defined', '/login');
+        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');
+        if ($action == 'login') {
+            return $this->socialAuthService->handleLoginCallback($socialDriver);
+        }
+        if ($action == 'register') {
+            return $this->socialRegisterCallback($socialDriver);

         }
         return redirect()->back();
     }
         }
         return redirect()->back();
     }


@@ -282,6 +291,7 @@ class RegisterController extends Controller
      * @param $socialDriver
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws UserRegistrationException
      * @param $socialDriver
      * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      * @throws UserRegistrationException

+     * @throws \BookStack\Exceptions\SocialDriverNotConfigured

      */
     protected function socialRegisterCallback($socialDriver)
     {
      */
     protected function socialRegisterCallback($socialDriver)
     {


@@ -296,6 +306,4 @@ class RegisterController extends Controller
         ];
         return $this->registerUser($userData, $socialAccount);
     }
         ];
         return $this->registerUser($userData, $socialAccount);
     }

-
-
-}
\ No newline at end of file
+}