Add default_template as Book setting

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

diff --git a/app/Http/Controllers/Auth/SocialController.php b/app/Http/Controllers/Auth/SocialController.php
index d4cfe4fe3ea4f79b0b0a325885d19594f6266d41..9ba4028ec4e8fef924060a6d4c8b74bef59eee6b 100644 (file)
--- a/app/Http/Controllers/Auth/SocialController.php
+++ b/app/Http/Controllers/Auth/SocialController.php
@@ -2,6 +2,7 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

+use BookStack\Auth\Access\LoginService;

 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;


@@ -15,32 +16,39 @@ use Laravel\Socialite\Contracts\User as SocialUser;
 
 class SocialController extends Controller
 {
 
 class SocialController extends Controller
 {

-
-    protected $socialAuthService;
-    protected $registrationService;
+    protected SocialAuthService $socialAuthService;
+    protected RegistrationService $registrationService;
+    protected LoginService $loginService;

 
     /**
      * SocialController constructor.
      */
 
     /**
      * SocialController constructor.
      */

-    public function __construct(SocialAuthService $socialAuthService, RegistrationService $registrationService)
-    {
-        $this->middleware('guest')->only(['getRegister', 'postRegister']);
+    public function __construct(
+        SocialAuthService $socialAuthService,
+        RegistrationService $registrationService,
+        LoginService $loginService
+    ) {
+        $this->middleware('guest')->only(['register']);

         $this->socialAuthService = $socialAuthService;
         $this->registrationService = $registrationService;
         $this->socialAuthService = $socialAuthService;
         $this->registrationService = $registrationService;

+        $this->loginService = $loginService;

     }
 
     /**
      * Redirect to the relevant social site.
     }
 
     /**
      * Redirect to the relevant social site.

+     *

      * @throws SocialDriverNotConfigured
      */
     public function login(string $socialDriver)
     {
         session()->put('social-callback', 'login');
      * @throws SocialDriverNotConfigured
      */
     public function login(string $socialDriver)
     {
         session()->put('social-callback', 'login');

+

         return $this->socialAuthService->startLogIn($socialDriver);
     }
 
     /**
      * Redirect to the social site for authentication intended to register.
         return $this->socialAuthService->startLogIn($socialDriver);
     }
 
     /**
      * Redirect to the social site for authentication intended to register.

+     *

      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      */
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      */


@@ -48,11 +56,13 @@ class SocialController extends Controller
     {
         $this->registrationService->ensureRegistrationAllowed();
         session()->put('social-callback', 'register');
     {
         $this->registrationService->ensureRegistrationAllowed();
         session()->put('social-callback', 'register');

+

         return $this->socialAuthService->startRegister($socialDriver);
     }
 
     /**
      * The callback for social login services.
         return $this->socialAuthService->startRegister($socialDriver);
     }
 
     /**
      * The callback for social login services.

+     *

      * @throws SocialSignInException
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException
      * @throws SocialSignInException
      * @throws SocialDriverNotConfigured
      * @throws UserRegistrationException


@@ -67,7 +77,7 @@ class SocialController extends Controller
         if ($request->has('error') && $request->has('error_description')) {
             throw new SocialSignInException(trans('errors.social_login_bad_response', [
                 'socialAccount' => $socialDriver,
         if ($request->has('error') && $request->has('error_description')) {
             throw new SocialSignInException(trans('errors.social_login_bad_response', [
                 'socialAccount' => $socialDriver,

-                'error' => $request->get('error_description'),
+                'error'         => $request->get('error_description'),

             ]), '/login');
         }
 
             ]), '/login');
         }
 


@@ -82,6 +92,7 @@ class SocialController extends Controller
                 if ($this->socialAuthService->driverAutoRegisterEnabled($socialDriver)) {
                     return $this->socialRegisterCallback($socialDriver, $socialUser);
                 }
                 if ($this->socialAuthService->driverAutoRegisterEnabled($socialDriver)) {
                     return $this->socialRegisterCallback($socialDriver, $socialUser);
                 }

+

                 throw $exception;
             }
         }
                 throw $exception;
             }
         }


@@ -100,24 +111,26 @@ class SocialController extends Controller
     {
         $this->socialAuthService->detachSocialAccount($socialDriver);
         session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => Str::title($socialDriver)]));
     {
         $this->socialAuthService->detachSocialAccount($socialDriver);
         session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => Str::title($socialDriver)]));

+

         return redirect(user()->getEditUrl());
     }
 
     /**
      * Register a new user after a registration callback.
         return redirect(user()->getEditUrl());
     }
 
     /**
      * Register a new user after a registration callback.

+     *

      * @throws UserRegistrationException
      */
     protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)
     {
         $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser);
      * @throws UserRegistrationException
      */
     protected function socialRegisterCallback(string $socialDriver, SocialUser $socialUser)
     {
         $socialUser = $this->socialAuthService->handleRegistrationCallback($socialDriver, $socialUser);

-        $socialAccount = $this->socialAuthService->fillSocialAccount($socialDriver, $socialUser);
+        $socialAccount = $this->socialAuthService->newSocialAccount($socialDriver, $socialUser);

         $emailVerified = $this->socialAuthService->driverAutoConfirmEmailEnabled($socialDriver);
 
         // Create an array of the user data to create a new user instance
         $userData = [
         $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(32)
+            'name'     => $socialUser->getName(),
+            'email'    => $socialUser->getEmail(),
+            'password' => Str::random(32),

         ];
 
         // Take name from email address if empty
         ];
 
         // Take name from email address if empty


@@ -126,9 +139,9 @@ class SocialController extends Controller
         }
 
         $user = $this->registrationService->registerUser($userData, $socialAccount, $emailVerified);
         }
 
         $user = $this->registrationService->registerUser($userData, $socialAccount, $emailVerified);

-        auth()->login($user);
-

         $this->showSuccessNotification(trans('auth.register_success'));
         $this->showSuccessNotification(trans('auth.register_success'));

+        $this->loginService->login($user, $socialDriver);
+

         return redirect('/');
     }
 }
         return redirect('/');
     }
 }