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

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse source
This commit is contained in:
Hillel Coren 2017-08-08 07:21:53 +03:00
commit 07296fae9b
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Ninja/OAuth/OAuth.php
View file

@ -30,7 +30,7 @@ class OAuth {
$user = null;
if($this->providerInstance)
$user = User::where('email', $this->providerInstance->getTokenResponse($token))->first();
$user = User::where('oauth_user_id', $this->providerInstance->getTokenResponse($token))->first();
if ($user)
return $user;

8
app/Ninja/OAuth/Providers/Google.php
View file

@ -9,7 +9,7 @@ class Google implements ProviderInterface
$client = new \Google_Client(['client_id' => env('GOOGLE_CLIENT_ID','')]);
$payload = $client->verifyIdToken($token);
if ($payload)
return $this->harvestEmail($payload);
return $this->harvestSubField($payload);
else
return null;
}
@ -19,5 +19,9 @@ class Google implements ProviderInterface
return $payload['email'];
}
private function harvestSubField($payload)
{
$data = $payload->getAttributes();
return $data['payload']['sub']; // user ID
}
}