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 1d1468698734ce8d61e5d415838af11212e4e0f6..9ba4028ec4e8fef924060a6d4c8b74bef59eee6b 100644 (file)
--- a/app/Http/Controllers/Auth/SocialController.php
+++ b/app/Http/Controllers/Auth/SocialController.php
@@ -2,33 +2,36 @@
 
 namespace BookStack\Http\Controllers\Auth;
 
 
 namespace BookStack\Http\Controllers\Auth;
 

-use BookStack\Actions\ActivityType;
+use BookStack\Auth\Access\LoginService;

 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Auth\Access\RegistrationService;
 use BookStack\Auth\Access\SocialAuthService;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;

-use BookStack\Facades\Theme;

 use BookStack\Http\Controllers\Controller;
 use BookStack\Http\Controllers\Controller;

-use BookStack\Theming\ThemeEvents;

 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\User as SocialUser;
 
 class SocialController extends Controller
 {
 use Illuminate\Http\Request;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\User as SocialUser;
 
 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;

     }
 
     /**
     }
 
     /**


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

-        auth()->login($user);
-        Theme::dispatch(ThemeEvents::AUTH_LOGIN, $socialDriver, $user);
-        $this->logActivity(ActivityType::AUTH_LOGIN, $user);
-

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

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

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