old_contents: Google = {};
  
  // https://developers.google.com/accounts/docs/OAuth2Login#userinfocall
  Google.whitelistedFields = ['id', 'email', 'verified_email', 'name', 'given_name',
                     'family_name', 'picture', 'locale', 'timezone', 'gender'];
  
  
  OAuth.registerService('google', 2, null, function(query) {
  
    var response = getTokens(query);
    var accessToken = response.accessToken;
    var identity = getIdentity(accessToken);
  
    var serviceData = {
      accessToken: accessToken,
      expiresAt: (+new Date) + (1000 * response.expiresIn)
    };
  
    var fields = _.pick(identity, Google.whitelistedFields);
    _.extend(serviceData, fields);
  
    // 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;
  
    return {
      serviceData: serviceData,
      options: {profile: {name: identity.name}}
    };
  });
  
  // returns an object containing:
  // - accessToken
  // - expiresIn: lifetime of token in seconds
  // - refreshToken, if this is the first authorization request
  var getTokens = function (query) {
    var config = ServiceConfiguration.configurations.findOne({service: 'google'});
    if (!config)
      throw new ServiceConfiguration.ConfigError();
  
    var response;
    try {
      response = HTTP.post(
        "https://accounts.google.com/o/oauth2/token", {params: {
          code: query.code,
          client_id: config.clientId,
          client_secret: OAuth.openSecret(config.secret),
          redirect_uri: Meteor.absoluteUrl("_oauth/google?close"),
          grant_type: 'authorization_code'
        }});
    } catch (err) {
      throw _.extend(new Error("Failed to complete OAuth handshake with Google. " + err.message),
                     {response: err.response});
    }
  
    if (response.data.error) { // if the http response was a json object with an error attribute
      throw new Error("Failed to complete OAuth handshake with Google. " + response.data.error);
    } else {
      return {
        accessToken: response.data.access_token,
        refreshToken: response.data.refresh_token,
        expiresIn: response.data.expires_in
      };
    }
  };
  
  var getIdentity = function (accessToken) {
    try {
      return HTTP.get(
        "https://www.googleapis.com/oauth2/v1/userinfo",
        {params: {access_token: accessToken}}).data;
    } catch (err) {
      throw _.extend(new Error("Failed to fetch identity from Google. " + err.message),
                     {response: err.response});
    }
  };
  
  
  Google.retrieveCredential = function(credentialToken) {
    return OAuth.retrieveCredential(credentialToken);
  };
  
new_contents: Google = {};
  
  // https://developers.google.com/accounts/docs/OAuth2Login#userinfocall
  Google.whitelistedFields = ['id', 'email', 'verified_email', 'name', 'given_name',
                     'family_name', 'picture', 'locale', 'timezone', 'gender'];
  
  
  OAuth.registerService('google', 2, null, function(query) {
  
    var response = getTokens(query);
    var accessToken = response.accessToken;
    var identity = getIdentity(accessToken);
  
    var serviceData = {
      accessToken: accessToken,
      expiresAt: (+new Date) + (1000 * response.expiresIn)
    };
  
    var fields = _.pick(identity, Google.whitelistedFields);
    _.extend(serviceData, fields);
  
    // 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;
  
    return {
      serviceData: serviceData,
      options: {profile: {name: identity.name}}
    };
  });
  
  // returns an object containing:
  // - accessToken
  // - expiresIn: lifetime of token in seconds
  // - refreshToken, if this is the first authorization request
  var getTokens = function (query) {
    var config = ServiceConfiguration.configurations.findOne({service: 'google'});
    if (!config)
      throw new ServiceConfiguration.ConfigError();
  
    var response;
    try {
      response = HTTP.post(
        "https://accounts.google.com/o/oauth2/token", {params: {
          code: query.code,
          client_id: config.clientId,
          client_secret: OAuth.openSecret(config.secret),
          redirect_uri: Meteor.absoluteUrl("_oauth/google?close"),
          grant_type: 'authorization_code'
        }});
    } catch (err) {
      throw _.extend(new Error("Failed to complete OAuth handshake with Google. " + err.message),
                     {response: err.response});
    }
  
    if (response.data.error) { // if the http response was a json object with an error attribute
      throw new Error("Failed to complete OAuth handshake with Google. " + response.data.error);
    } else {
      return {
        accessToken: response.data.access_token,
        refreshToken: response.data.refresh_token,
        expiresIn: response.data.expires_in
      };
    }
  };
  
  var getIdentity = function (accessToken) {
    try {
      return HTTP.get(
        "https://www.googleapis.com/oauth2/v1/userinfo",
        {params: {access_token: accessToken}}).data;
    } catch (err) {
      throw _.extend(new Error("Failed to fetch identity from Google. " + err.message),
                     {response: err.response});
    }
  };
  
  
  Google.retrieveCredential = function(credentialToken, credentialSecret) {
    return OAuth.retrieveCredential(credentialToken, credentialSecret);
  };
  
subject: Add credentialSecret to `Google.retrieveCredential`