colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added function for redirect with parameters for Socialite

This commit is contained in:
Justin Stein 2018-11-04 10:40:06 -08:00
parent 216358c6e4
commit 0283ab11b5
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Auth/Access/SocialAuthService.php
View File

@ -40,10 +40,7 @@ class SocialAuthService
public function startLogIn($socialDriver) public function startLogIn($socialDriver)
{ {
$driver = $this->validateDriver($socialDriver); $driver = $this->validateDriver($socialDriver);
if ($socialDriver == 'google' && env('GOOGLE_SELECT_ACCOUNT')) { return $this->redirectToSocialProvider($driver);
return $this->socialite->driver($driver)->with(['prompt' => 'select_account'])->redirect();
}
return $this->socialite->driver($driver)->redirect();
} }
/** /**
@ -55,10 +52,7 @@ class SocialAuthService
public function startRegister($socialDriver) public function startRegister($socialDriver)
{ {
$driver = $this->validateDriver($socialDriver); $driver = $this->validateDriver($socialDriver);
if ($socialDriver == 'google' && env('GOOGLE_SELECT_ACCOUNT')) { return $this->redirectToSocialProvider($driver);
return $this->socialite->driver($driver)->with(['prompt' => 'select_account'])->redirect();
}
return $this->socialite->driver($driver)->redirect();
} }
/** /**
@ -253,4 +247,19 @@ class SocialAuthService
session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => title_case($socialDriver)])); session()->flash('success', trans('settings.users_social_disconnected', ['socialAccount' => title_case($socialDriver)]));
return redirect(user()->getEditUrl()); return redirect(user()->getEditUrl());
} }
/**
* Provide redirect options per service for the Laravel Socialite driver
* @param $driver
* @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
public function redirectToSocialProvider($driver)
{
if ($driver == 'google' && config('services.google.select_account'))
{
return $this->socialite->driver($driver)->with(['prompt' => 'select_account'])->redirect();
}
return $this->socialite->driver($driver)->redirect();
}
} }