leonardo/yii2-usuario
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #318 from Julian-B90/new-response-from-google-api

Browse Source 
New response from google api
This commit is contained in:
Antonio Ramirez
2019-06-16 13:16:19 +02:00
committed by GitHub
parent b62143b39b 2ef931d52e
commit 0642ced6b3
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
# CHANGELOG # CHANGELOG
- Fix #307: Fix French translation (arollmann) - Fix #307: Fix French translation (arollmann)
- Fix #316: Fix New Response from Google OAuth Api
## 1.5.0 April 19, 2019 ## 1.5.0 April 19, 2019
- Fix: Fix condition in EmailChangeService (it was always false) (borisaeric) - Fix: Fix condition in EmailChangeService (it was always false) (borisaeric)

11
src/User/AuthClient/Google.php
View File

@ -21,9 +21,14 @@ class Google extends BaseGoogle implements AuthClientInterface
*/ */
public function getEmail() public function getEmail()
{ {
return isset($this->getUserAttributes()['emails'][0]['value']) $userAttributes = $this->getUserAttributes();
? $this->getUserAttributes()['emails'][0]['value'] if (isset($userAttributes['emails']) && isset($userAttributes['emails'][0]['value'])) {
: null; return $userAttributes['emails'][0]['value'];
} elseif (isset($userAttributes['email'])) {
return $userAttributes['email'];
}
return null;
} }
/** /**