Skip intermediate login page with single provider

[bookstack] / app / Auth / Access / SocialAuthService.php

diff --git a/app/Auth/Access/SocialAuthService.php b/app/Auth/Access/SocialAuthService.php
index 2f1a6876a13e5a753d5d437dd24e49a36fda81a7..0df5ceb5ee679fe655c33a1fafd78f86226ab7af 100644 (file)
--- a/app/Auth/Access/SocialAuthService.php
+++ b/app/Auth/Access/SocialAuthService.php
@@ -2,20 +2,17 @@
 
 namespace BookStack\Auth\Access;
 
 
 namespace BookStack\Auth\Access;
 

-use BookStack\Actions\ActivityType;

 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\UserRegistrationException;
 use BookStack\Auth\SocialAccount;
 use BookStack\Auth\User;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInAccountNotUsed;
 use BookStack\Exceptions\UserRegistrationException;

-use BookStack\Facades\Activity;
-use BookStack\Facades\Theme;
-use BookStack\Theming\ThemeEvents;

 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use Laravel\Socialite\Contracts\Provider;
 use Laravel\Socialite\Contracts\User as SocialUser;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Str;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use Laravel\Socialite\Contracts\Provider;
 use Laravel\Socialite\Contracts\User as SocialUser;

+use Laravel\Socialite\Two\GoogleProvider;

 use SocialiteProviders\Manager\SocialiteWasCalled;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 use SocialiteProviders\Manager\SocialiteWasCalled;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 


@@ -28,6 +25,11 @@ class SocialAuthService
      */
     protected $socialite;
 
      */
     protected $socialite;
 

+    /**
+     * @var LoginService
+     */
+    protected $loginService;
+

     /**
      * The default built-in social drivers we support.
      *
     /**
      * The default built-in social drivers we support.
      *


@@ -59,9 +61,10 @@ class SocialAuthService
     /**
      * SocialAuthService constructor.
      */
     /**
      * SocialAuthService constructor.
      */

-    public function __construct(Socialite $socialite)
+    public function __construct(Socialite $socialite, LoginService $loginService)

     {
         $this->socialite = $socialite;
     {
         $this->socialite = $socialite;

+        $this->loginService = $loginService;

     }
 
     /**
     }
 
     /**


@@ -139,9 +142,7 @@ class SocialAuthService
         // When a user is not logged in and a matching SocialAccount exists,
         // Simply log the user into the application.
         if (!$isLoggedIn && $socialAccount !== null) {
         // When a user is not logged in and a matching SocialAccount exists,
         // Simply log the user into the application.
         if (!$isLoggedIn && $socialAccount !== null) {

-            auth()->login($socialAccount->user);
-            Activity::add(ActivityType::AUTH_LOGIN, $socialAccount);
-            Theme::dispatch(ThemeEvents::AUTH_LOGIN, $socialDriver, $socialAccount->user);
+            $this->loginService->login($socialAccount->user, $socialDriver);

 
             return redirect()->intended('/');
         }
 
             return redirect()->intended('/');
         }


@@ -278,12 +279,9 @@ class SocialAuthService
     {
         $driver = $this->socialite->driver($driverName);
 
     {
         $driver = $this->socialite->driver($driverName);
 

-        if ($driverName === 'google' && config('services.google.select_account')) {
+        if ($driver instanceof GoogleProvider && config('services.google.select_account')) {

             $driver->with(['prompt' => 'select_account']);
         }
             $driver->with(['prompt' => 'select_account']);
         }

-        if ($driverName === 'azure') {
-            $driver->with(['resource' => 'https://graph.windows.net']);
-        }

 
         if (isset($this->configureForRedirectCallbacks[$driverName])) {
             $this->configureForRedirectCallbacks[$driverName]($driver);
 
         if (isset($this->configureForRedirectCallbacks[$driverName])) {
             $this->configureForRedirectCallbacks[$driverName]($driver);