Done a refactor pass on PermissionService

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

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index c9c0c3ec5000f26a2d5cd0404b17b052c52ef394..cbec1f03f6e3b0b58704b17de79e21f8bf975a8c 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -43,14 +43,14 @@ class RegisterController extends Controller
      */
     public function __construct(SocialAuthService $socialAuthService, RegistrationService $registrationService)
     {
      */
     public function __construct(SocialAuthService $socialAuthService, RegistrationService $registrationService)
     {

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

 
         $this->socialAuthService = $socialAuthService;
         $this->registrationService = $registrationService;
 
         $this->redirectTo = url('/');
         $this->redirectPath = url('/');
 
         $this->socialAuthService = $socialAuthService;
         $this->registrationService = $registrationService;
 
         $this->redirectTo = url('/');
         $this->redirectPath = url('/');

-        parent::__construct();

     }
 
     /**
     }
 
     /**


@@ -73,12 +73,10 @@ class RegisterController extends Controller
      */
     public function getRegister()
     {
      */
     public function getRegister()
     {

-        $this->registrationService->checkRegistrationAllowed();
+        $this->registrationService->ensureRegistrationAllowed();

         $socialDrivers = $this->socialAuthService->getActiveDrivers();
         $socialDrivers = $this->socialAuthService->getActiveDrivers();

-        $samlEnabled = (config('saml2.enabled') === true) && (config('saml2.auto_register') === true);

         return view('auth.register', [
             'socialDrivers' => $socialDrivers,
         return view('auth.register', [
             'socialDrivers' => $socialDrivers,

-            'samlEnabled' => $samlEnabled,

         ]);
     }
 
         ]);
     }
 


@@ -88,12 +86,13 @@ class RegisterController extends Controller
      */
     public function postRegister(Request $request)
     {
      */
     public function postRegister(Request $request)
     {

-        $this->registrationService->checkRegistrationAllowed();
+        $this->registrationService->ensureRegistrationAllowed();

         $this->validator($request->all())->validate();
         $userData = $request->all();
 
         try {
         $this->validator($request->all())->validate();
         $userData = $request->all();
 
         try {

-            $this->registrationService->registerUser($userData);
+            $user = $this->registrationService->registerUser($userData);
+            auth()->login($user);

         } catch (UserRegistrationException $exception) {
             if ($exception->getMessage()) {
                 $this->showErrorNotification($exception->getMessage());
         } catch (UserRegistrationException $exception) {
             if ($exception->getMessage()) {
                 $this->showErrorNotification($exception->getMessage());


@@ -118,5 +117,4 @@ class RegisterController extends Controller
             'password' => Hash::make($data['password']),
         ]);
     }
             'password' => Hash::make($data['password']),
         ]);
     }

-

 }
 }