Use tokens from Google Sign-In instead of calling getTokens. (#8604)

* Use tokens from Google Sign-In instead of calling getTokens. Follow-up to #8588. * Bump google-oauth package version to 1.2.3.
meteor · Apr 25, 2017 · d5ba2a1 · d5ba2a1
1 parent 0d1cf9e
commit d5ba2a1
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/packages/google-oauth/google_server.js b/packages/google-oauth/google_server.js
@@ -6,21 +6,22 @@ var hasOwn = Object.prototype.hasOwnProperty;
 Google.whitelistedFields = ['id', 'email', 'verified_email', 'name', 'given_name',
                    'family_name', 'picture', 'locale', 'timezone', 'gender'];
 
-function getServiceData(query) {
-  var response = getTokens(query);
-  var expiresAt = (+new Date) + (1000 * parseInt(response.expiresIn, 10));
-  var accessToken = response.accessToken;
-  var idToken = response.idToken;
+function getServiceDataFromTokens(tokens) {
+  var accessToken = tokens.accessToken;
+  var idToken = tokens.idToken;
   var scopes = getScopes(accessToken);
   var identity = getIdentity(accessToken);
-
   var serviceData = {
     accessToken: accessToken,
     idToken: idToken,
-    expiresAt: expiresAt,
     scope: scopes
   };
 
+  if (hasOwn.call(tokens, "expiresAt")) {
+    serviceData.expiresAt =
+      Date.now() + 1000 * parseInt(tokens.expiresIn, 10);
+  }
+
   var fields = Object.create(null);
   Google.whitelistedFields.forEach(function (name) {
     if (hasOwn.call(identity, name)) {
@@ -33,12 +34,17 @@ function getServiceData(query) {
   // only set the token in serviceData if it's there. this ensures
   // that we don't lose old ones (since we only get this on the first
   // log in attempt)
-  if (response.refreshToken)
-    serviceData.refreshToken = response.refreshToken;
+  if (tokens.refreshToken) {
+    serviceData.refreshToken = tokens.refreshToken;
+  }
 
   return {
     serviceData: serviceData,
-    options: {profile: {name: identity.name}}
+    options: {
+      profile: {
+        name: identity.name
+      }
+    }
   };
 }
 
@@ -47,18 +53,26 @@ Accounts.registerLoginHandler(function (request) {
     return;
   }
 
+  const { serviceData } = getServiceDataFromTokens({
+    accessToken: request.accessToken,
+    refreshToken: request.refreshToken,
+    idToken: request.idToken,
+  });
+
   return Accounts.updateOrCreateUserFromExternalService("google", {
     id: request.userId,
     idToken: request.idToken,
     accessToken: request.accessToken,
     email: request.email,
     picture: request.imageUrl,
-    ...getServiceData({
-      code: request.serverAuthCode
-    }).serviceData,
+    ...serviceData,
   });
 });
 
+function getServiceData(query) {
+  return getServiceDataFromTokens(getTokens(query));
+}
+
 OAuth.registerService('google', 2, null, getServiceData);
 
 // returns an object containing:

diff --git a/packages/google-oauth/package.js b/packages/google-oauth/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   summary: "Google OAuth flow",
-  version: "1.2.2"
+  version: "1.2.3"
 });
 
 var cordovaPluginGooglePlusURL =