Merge 6d23763 into 4e3902f

adonisjs · Dec 28, 2018 · 20b14c5 · 20b14c5
2 parents 4e3902f + 6d23763
commit 20b14c5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="2.1.3"></a>
+## [2.1.3](https://github.com/adonisjs/adonis-ally/compare/v2.1.2...v2.1.3) (2018-12-28)
+
+
+### Bug Fixes
+
+* **google:** updated driver because of Google+ API [shutdown](https://developers.google.com/+/api-shutdown)
+
 <a name="2.1.2"></a>
 ## [2.1.2](https://github.com/adonisjs/adonis-ally/compare/v2.1.1...v2.1.2) (2018-10-15)
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/ally",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "description": "Social authenticator for AdonisJs Framework",
   "main": "index.js",
   "files": [

diff --git a/src/Drivers/Google.js b/src/Drivers/Google.js
@@ -127,7 +127,7 @@ class Google extends OAuth2Scheme {
    * @private
    */
   async _getUserProfile (accessToken) {
-    const profileUrl = 'https://www.googleapis.com/plus/v1/people/me'
+    const profileUrl = 'https://www.googleapis.com/oauth2/v3/userinfo'
 
     const response = await got(profileUrl, {
       headers: {
@@ -156,11 +156,11 @@ class Google extends OAuth2Scheme {
 
     user.setOriginal(userProfile)
       .setFields(
-        userProfile.id,
-        userProfile.displayName,
-        _.get(userProfile, 'emails.0.value'),
-        userProfile.displayName,
-        _.get(userProfile, 'image.url')
+        userProfile.sub,
+        userProfile.name,
+        userProfile.email,
+        userProfile.name,
+        userProfile.picture
       )
       .setToken(
         accessTokenResponse.accessToken,