update endpoint to get user data

lib/carto/oauth/google/api.rb

@@ -39,19 +39,19 @@ module Carto
         private
 
         def id
-          user_data['id']
+          user_data['sub']
         end
 
         def first_name
-          user_data.fetch('name', {}).fetch('givenName', nil)
+          user_data.fetch('given_name', nil)
         end
 
         def last_name
-          user_data.fetch('name', {}).fetch('familyName', nil)
+          user_data.fetch('family_name', nil)
         end
 
         def email
-          user_data['emails'].select { |mail| mail['type'] == 'account' }.first['value']
+          user_data['email']
         end
 
         def user_data
@@ -64,7 +64,7 @@ module Carto
 
         def get_user_data
           response = Typhoeus::Request.new(
-            "https://www.googleapis.com/plus/v1/people/me?access_token=#{access_token}",
+            "https://openidconnect.googleapis.com/v1/userinfo?access_token=#{access_token}",
             method: 'GET',
             ssl_verifypeer: true,
             timeout: 600

lib/google_plus_api.rb

@@ -29,7 +29,7 @@ class GooglePlusAPI
   def request_user_data(access_token)
     http_client = Carto::Http::Client.get(self.class.name)
     http_client.request(
-      "https://www.googleapis.com/plus/v1/people/me?access_token=#{access_token}",
+      "https://openidconnect.googleapis.com/v1/userinfo?access_token=#{access_token}",
       method: 'GET',
       ssl_verifypeer: true,
       timeout: 600

lib/google_plus_api_user_data.rb

@@ -8,9 +8,7 @@ class GooglePlusAPIUserData
   end
 
   def email
-    @parsed_response['emails'].select { |mail| mail['type'] == 'account' }.first['value']
-  rescue
-    nil
+    @parsed_response['email']
   end
 
   def auto_username
@@ -18,7 +16,7 @@ class GooglePlusAPIUserData
   end
 
   def id
-    @parsed_response['id']
+    @parsed_response['sub']
   end
 
   def set_values(user)