tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for OAuth (#3118)

Browse source
This commit is contained in:
David Bomba 2019-12-04 12:26:57 +11:00 • committed by GitHub
parent 0d15926e02
commit fb2ca5dbe9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Auth/LoginController.php
View file

@ -249,7 +249,7 @@ class LoginController extends BaseController
if(request()->has('code'))
return $this->handleProviderCallback($provider);
else
return Socialite::driver($provider)->scopes('gmail.send')->redirect();
return Socialite::driver($provider)->scopes('https://www.googleapis.com/auth/gmail.send')->redirect();
}
@ -261,7 +261,7 @@ class LoginController extends BaseController
if(request()->has('code'))
return $this->handleProviderCallbackAndCreate($provider);
else
return Socialite::driver($provider)->scopes('gmail.send')->redirectUrl($redirect_url)->redirect();
return Socialite::driver($provider)->scopes('https://www.googleapis.com/auth/gmail.send')->redirectUrl($redirect_url)->redirect();
}
@ -270,7 +270,10 @@ class LoginController extends BaseController
public function handleProviderCallbackAndCreate(string $provider)
{
$redirect_url = config('services.' . $provider . '.redirect') . '/create';
$socialite_user = Socialite::driver($provider)
->redirectUrl($redirect_url)
->stateless()
->user();
@ -320,7 +323,11 @@ class LoginController extends BaseController
*/
public function handleProviderCallback(string $provider)
{
$redirect_url = config('services.' . $provider . '.redirect');
$socialite_user = Socialite::driver($provider)
->redirectUrl($redirect_url)
->stateless()
->user();