Change userinfo endpoint to the JSON one.

remoting/webapp/oauth2.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * OAuth2 class that handles retrieval/storage of an OAuth2 token.
  *
  * Uses a content script to trampoline the OAuth redirect page back into the
  * extension context.  This works around the lack of native support for
@@ skipping 22 matching lines @@
 /** @private */
 remoting.OAuth2.prototype.KEY_ACCESS_TOKEN_ = 'oauth2-access-token';
 /** @private */
 remoting.OAuth2.prototype.KEY_EMAIL_ = 'remoting-email';
 
 // Constants for parameters used in retrieving the OAuth2 credentials.
 /** @private */
 remoting.OAuth2.prototype.SCOPE_ =
       'https://www.googleapis.com/auth/chromoting ' +
       'https://www.googleapis.com/auth/googletalk ' +
       'https://www.googleapis.com/auth/userinfo#email';

[Jamie, 2013/01/09 18:51:09]

Does the scope need to be changed as well? And if it does, will existing OAuth
tokens remain valid?

[rmsousa, 2013/01/09 20:34:39]

Same scope, no issue with the tokens.

 /** @private */
 remoting.OAuth2.prototype.OAUTH2_TOKEN_ENDPOINT_ =
     'https://accounts.google.com/o/oauth2/token';
 /** @private */
 remoting.OAuth2.prototype.OAUTH2_VALIDATE_TOKEN_ENDPOINT_ =
     'https://www.googleapis.com/oauth2/v1/tokeninfo';
 /** @private */
 remoting.OAuth2.prototype.OAUTH2_REVOKE_TOKEN_ENDPOINT_ =
     'https://accounts.google.com/o/oauth2/revoke';
 
@@ skipping 431 matching lines @@
   if (typeof cached == 'string') {
     onOk(cached);
     return;
   }
   /** @type {remoting.OAuth2} */
   var that = this;
   /** @param {XMLHttpRequest} xhr The XHR response. */
   var onResponse = function(xhr) {
     var email = null;
     if (xhr.status == 200) {
-      // TODO(ajwong): See if we can't find a JSON endpoint.
-      email = xhr.responseText.split('&')[0].split('=')[1];
-      window.localStorage.setItem(that.KEY_EMAIL_, email);
-      onOk(email);
+      var result =
+        /** @type {{email: string}} */ (jsonParseSafe(xhr.responseText));
+      window.localStorage.setItem(that.KEY_EMAIL_, result.email);
+      onOk(result.email);

[Jamie, 2013/01/09 18:51:09]

I think we could benefit from some sanity-checking code here to make sure that
there is an email member, and perhaps pass ERROR_UNEXPECTED to onError if not.

[rmsousa, 2013/01/09 20:34:39]

Done.

       return;
     }
     console.error('Unable to get email address:', xhr.status, xhr);
     if (xhr.status == 401) {
       onError(remoting.Error.AUTHENTICATION_FAILED);
     } else {
       onError(that.interpretUnexpectedXhrStatus_(xhr.status));
     }
   };
 
   /** @param {string} token The access token. */
   var getEmailFromToken = function(token) {
     var headers = { 'Authorization': 'OAuth ' + token };
-    // TODO(ajwong): Update to new v2 API.
-    remoting.xhr.get('https://www.googleapis.com/userinfo/email',
+    remoting.xhr.get('https://www.googleapis.com/oauth2/v1/userinfo',
                      onResponse, '', headers);
   };
 
   this.callWithToken(getEmailFromToken, onError);
 };
 
 /**
  * If the user's email address is cached, return it, otherwise return null.
  *
  * @return {?string} The email address, if it has been cached by a previous call
  *     to getEmail, otherwise null.
  */
 remoting.OAuth2.prototype.getCachedEmail = function() {
   var value = window.localStorage.getItem(this.KEY_EMAIL_);
   if (typeof value == 'string') {
     return value;
   }
   return null;
 };