Prevented finding of check script in lang tests

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

diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index 8b0ef309aeba8c61d156a4fd0692dbc94e2ba712..0fa005e1fbe0b77fee9b997c186602121cdc58e9 100644 (file)
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -8,6 +8,7 @@ use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Repos\UserRepo;
 use BookStack\Services\EmailConfirmationService;
 use BookStack\Services\SocialAuthService;
 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;


@@ -52,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')->except(['socialCallback', 'detachSocialAccount']);
+        $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;


@@ -103,7 +104,7 @@ class RegisterController extends Controller
      * @param Request|\Illuminate\Http\Request $request
      * @return Response
      * @throws UserRegistrationException
      * @param Request|\Illuminate\Http\Request $request
      * @return Response
      * @throws UserRegistrationException

-     * @throws \Illuminate\Foundation\Validation\ValidationException
+     * @throws \Illuminate\Validation\ValidationException

      */
     public function postRegister(Request $request)
     {
      */
     public function postRegister(Request $request)
     {


@@ -230,7 +231,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');
     }


@@ -255,16 +255,13 @@ class RegisterController extends Controller
      */
     public function socialCallback($socialDriver)
     {
      */
     public function socialCallback($socialDriver)
     {

-        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 {
+        if (!session()->has('social-callback')) {

             throw new SocialSignInException(trans('errors.social_no_action_defined'), '/login');
         }
             throw new SocialSignInException(trans('errors.social_no_action_defined'), '/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();
     }