Basic OAuth2 support using the native app flow.

remoting/webapp/me2mom/remoting.js

 // Copyright (c) 2011 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.
 
+// TODO(ajwong): This seems like a bad idea.  Why are we doing it like this?
 var remoting = chrome.extension.getBackgroundPage().remoting;
+
 XMPP_LOGIN_NAME = 'xmpp_login';
 XMPP_TOKEN_NAME = 'xmpp_token';
-OAUTH2_TOKEN_NAME = 'oauth2_token';
 HOST_PLUGIN_ID = 'host_plugin_id';
 
 function updateAuthStatus_() {
-  var oauth1_status = document.getElementById('oauth1_status');
-  if (remoting.oauth.hasToken()) {
-    oauth1_status.innerText = 'OK';
-    oauth1_status.style.color = 'green';
+  var oauth2_status = document.getElementById('oauth2_status');
+  if (remoting.oauth2.isAuthenticated()) {
+    oauth2_status.innerText = 'OK';
+    oauth2_status.style.color = 'green';
+    document.getElementById('oauth2_code_button').style.display = 'none';
+    document.getElementById('oauth2_clear_button').style.display = 'inline';
+    document.getElementById('oauth2_form').style.display = 'none';
   } else {
-    oauth1_status.innerText = 'Unauthorized';
-    oauth1_status.style.color = 'red';
+    oauth2_status.innerText = 'Unauthorized';
+    oauth2_status.style.color = 'red';
+    document.getElementById('oauth2_code_button').style.display = 'inline';
+    document.getElementById('oauth2_clear_button').style.display = 'none';
+    document.getElementById('oauth2_form').style.display = 'inline';
   }
   var xmpp_status = document.getElementById('xmpp_status');
   if (remoting.getItem(XMPP_TOKEN_NAME) && remoting.getItem(XMPP_LOGIN_NAME)) {
     document.getElementById('xmpp_clear').style.display = 'inline';
     document.getElementById('xmpp_form').style.display = 'none';
     xmpp_status.innerText = 'OK';
     xmpp_status.style.color = 'green';
     remoting.xmppAuthToken = remoting.getItem(XMPP_TOKEN_NAME);
   } else {
     document.getElementById('xmpp_clear').style.display = 'none';
@@ skipping 42 matching lines @@
 
 function initAuthPanel_() {
   updateAuthStatus_();
   resetXmppErrors_();
 }
 
 function initBackgroundFuncs_() {
   remoting.getItem = chrome.extension.getBackgroundPage().getItem;
   remoting.setItem = chrome.extension.getBackgroundPage().setItem;
   remoting.removeItem = chrome.extension.getBackgroundPage().removeItem;
-  remoting.oauth = chrome.extension.getBackgroundPage().oauth;
+  remoting.oauth2 = chrome.extension.getBackgroundPage().oauth2;
 }
 
 function authorizeXmpp(form) {
   var xhr = new XMLHttpRequest();
   var captcha_result = readAndClearCaptcha_(form);
 
   xhr.onreadystatechange = function() {
     if (xhr.readyState != 4) {
       return;
     }
@@ skipping 32 matching lines @@
       '&Email=' + encodeURIComponent(form['xmpp_username'].value) +
       '&Passwd=' + encodeURIComponent(form['xmpp_password'].value);
 
   if (captcha_result[0]) {
     post_data += '&logintoken=' + encodeURIComponent(captcha_result[0]) +
         '&logincaptcha=' + encodeURIComponent(captcha_result[1]);
   }
   xhr.send(post_data);
 }
 
-function authorizeOAuth1() {
-  remoting.oauth.authorize(updateAuthStatus_);
+function authorizeOAuth2(code) {
+  remoting.oauth2.exchangeCodeForToken(code, updateAuthStatus_);
 }
 
-function clearOAuth1() {
-  remoting.oauth.clearTokens();
+function clearOAuth2() {
+  remoting.oauth2.clear();
   updateAuthStatus_();
 }
 
 function clearXmpp() {
   remoting.removeItem(XMPP_TOKEN_NAME);
   updateAuthStatus_();
 }
 
 // Show the div with id |mode| and hide those with other ids in |modes|.
 function setMode_(mode, modes) {
@@ skipping 86 matching lines @@
   } else {
     invalid.style.display = 'none';
     other.style.display = 'block';
     var responseNode = document.getElementById('server_response');
     responseNode.innerText = responseString + ' (' + responseCode + ')';
   }
   remoting.accessCode = '';
   setClientMode('connect_failed');
 }
 
-function parseServerResponse_(reply, xhr) {
+function parseServerResponse_(xhr) {
   if (xhr.status == 200) {
     var host = JSON.parse(xhr.responseText);
     if (host.data && host.data.jabberId) {
       remoting.hostjid = host.data.jabberId;
       startSession_();
       return;
     }
   }
   showConnectError_(xhr.status, xhr.responseText);
 }
 
+function resolveSupportId(support_id) {
+    var xhr = new XMLHttpRequest();
+    xhr.onreadystatechange = function() {
+      if (xhr.readyState != 4) {
+        return;
+      }
+      parseServerResponse_(xhr);
+    };
+
+    xhr.open('GET',
+             'https://www.googleapis.com/chromoting/v1/support-hosts/' +
+                 encodeURIComponent(support_id),
+             true);
+    xhr.setRequestHeader('Authorization',
+                         'OAuth ' + remoting.oauth2.getAccessToken());
+    xhr.send(null);
+}
+
 function tryConnect(form) {
   remoting.accessCode = form['access_code_entry'].value;
   // TODO(jamiewalch): Since the mapping from (SupportId, HostSecret) to
   // AccessCode is not yet defined, assume it's hyphen-separated for now.
   var parts = remoting.accessCode.split('-');
   if (parts.length != 2) {
     showConnectError_(404);
   } else {
     setClientMode('connecting');
-    var urlBase = 'https://www.googleapis.com/chromoting/v1/support-hosts/';
-    remoting.oauth.sendSignedRequest(
-        urlBase + '' + encodeURIComponent(parts[0]) + '',
-        parseServerResponse_);
+    if (remoting.oauth2.needsNewAccessToken()) {

[Jamie, 2011/05/19 21:01:04]

Should needsNewAccessToken take RTT into account, and refresh the access token a
minute or two early to make sure that it's still valid when the server verifies
it. Otherwise won't we see (very infrequent) failures?

[awong, 2011/05/19 21:33:06]

I timeshifted it on the setting of hte expiration.

+      remoting.oauth2.refreshAccessToken(function() {
+        resolveSupportId(parts[0]);
+      });
+      return;
+    } else {
+      resolveSupportId(parts[0]);
+    }
   }
 }
 
 function cancelConnect() {
   remoting.accessCode = '';
   setClientMode('unconnected');
 }