Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 02:07:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Working on OAuth (#3691)

Browse Source
This commit is contained in:
David Bomba 2020-05-13 15:40:55 +10:00 committed by GitHub
parent 47f7cce6ff
commit c3c39ffae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/Auth/LoginController.php
View File

@ -456,14 +456,10 @@ class LoginController extends BaseController
info(print_r($user,1)); info(print_r($user,1));
info("checked id token");
info(print_r($user,1));
info(print_r($oauth->getProvider(request()->input('provider'))->getTokenResponse(request()->input('id_token')),1));
if(is_array($user)) if(is_array($user))
{ {
$query = [ $query = [
'oauth_user_id' =>$oauth->getProvider(request()->input('provider'))->harvestSubField($user), 'oauth_user_id' => $google->harvestSubField($user),
'oauth_provider_id'=>$provider 'oauth_provider_id'=>$provider
]; ];
@ -485,14 +481,14 @@ info(print_r($oauth->getProvider(request()->input('provider'))->getTokenResponse
$client->setAccessToken($accessToken); $client->setAccessToken($accessToken);
$refresh_token = $client->getRefreshToken(); $refresh_token = $client->getRefreshToken();
$name = OAuth::splitName($oauth->getProvider(request()->input('provider'))->harvestName($user)); $name = OAuth::splitName($google->harvestName($user));
$new_account = [ $new_account = [
'first_name' => $name[0], 'first_name' => $name[0],
'last_name' => $name[1], 'last_name' => $name[1],
'password' => '', 'password' => '',
'email' => $oauth->getProvider(request()->input('provider'))->harvestEmail($user), 'email' => $google->harvestEmail($user),
'oauth_user_id' => $oauth->getProvider(request()->input('provider'))->harvestSubField($user), 'oauth_user_id' => $google->harvestSubField($user),
'oauth_user_token' => request()->input('access_token'), 'oauth_user_token' => request()->input('access_token'),
'oauth_user_refresh_token' => $refresh_token, 'oauth_user_refresh_token' => $refresh_token,
'oauth_provider_id' => $provider 'oauth_provider_id' => $provider